mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge staging-next into staging
This commit is contained in:
commit
cdd93936e4
97 changed files with 1556 additions and 522 deletions
|
|
@ -16082,6 +16082,12 @@
|
|||
githubId = 83420438;
|
||||
name = "Lewis";
|
||||
};
|
||||
luc65r = {
|
||||
email = "lucas@ransan.fr";
|
||||
github = "luc65r";
|
||||
githubId = 59375051;
|
||||
name = "Lucas Ransan";
|
||||
};
|
||||
LucaGuerra = {
|
||||
email = "luca@guerra.sh";
|
||||
github = "LucaGuerra";
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@ in
|
|||
LoadCredential = config.systemd.services.radicle-node.serviceConfig.LoadCredential or [ ];
|
||||
|
||||
BindReadOnlyPaths = config.systemd.services.radicle-node.serviceConfig.BindReadOnlyPaths ++ [
|
||||
"/run/credentials/radicle-ci-broker.service/xyz.radicle.node.secret:/var/lib/radicle/keys/radicle"
|
||||
"/run/credentials/radicle-ci-broker.service/dev.radicle.node.secret:/var/lib/radicle/keys/radicle"
|
||||
];
|
||||
ReadWritePaths = [ RAD_HOME ];
|
||||
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ let
|
|||
};
|
||||
|
||||
credentials = {
|
||||
privateKey = "xyz.radicle.node.secret";
|
||||
privateKeyPassphrase = "xyz.radicle.node.passphrase";
|
||||
privateKey = "dev.radicle.node.secret";
|
||||
privateKeyPassphrase = "dev.radicle.node.passphrase";
|
||||
};
|
||||
|
||||
# Convenient wrapper to run `rad` in the namespaces of `radicle-node.service`
|
||||
|
|
|
|||
|
|
@ -158,6 +158,7 @@ let
|
|||
builtins.storeDir
|
||||
"/etc/"
|
||||
]
|
||||
++ cfg.extraConfigFiles
|
||||
++ lib.optional (cfg.secretsFile != null) cfg.secretsFile;
|
||||
DeviceAllow = "/dev/rfkill rw";
|
||||
LockPersonality = true;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ in
|
|||
|
||||
nodes.seed = {
|
||||
virtualisation.credentials = {
|
||||
"xyz.radicle.node.secret".source = "${seed-ssh-keys.snakeOilEd25519PrivateKey}";
|
||||
"dev.radicle.node.secret".source = "${seed-ssh-keys.snakeOilEd25519PrivateKey}";
|
||||
};
|
||||
|
||||
services.radicle = {
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ in
|
|||
imports = [ commonHostConfig ];
|
||||
|
||||
virtualisation.credentials = {
|
||||
"xyz.radicle.node.secret".source = "${seed-ssh-keys.snakeOilEd25519PrivateKey}";
|
||||
"dev.radicle.node.secret".source = "${seed-ssh-keys.snakeOilEd25519PrivateKey}";
|
||||
};
|
||||
|
||||
services.radicle = {
|
||||
|
|
|
|||
|
|
@ -874,7 +874,7 @@ $ nix-build -A phoronix-test-suite.tests
|
|||
Here are examples of package tests:
|
||||
|
||||
- [Jasmin compile test](by-name/ja/jasmin/test-assemble-hello-world/default.nix)
|
||||
- [Lobster compile test](development/compilers/lobster/test-can-run-hello-world.nix)
|
||||
- [Lobster compile test](by-name/lo/lobster/test-can-run-hello-world.nix)
|
||||
- [Spacy annotation test](development/python-modules/spacy/annotation-test/default.nix)
|
||||
- [Libtorch test](development/libraries/science/math/libtorch/test/default.nix)
|
||||
- [Multiple tests for nanopb](./by-name/na/nanopb/package.nix)
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ callPackage ./generic.nix (
|
|||
brand = "Midas";
|
||||
type = "M32";
|
||||
version = "4.4.1";
|
||||
url = "https://cdn.mediavalet.com/aunsw/musictribe/Yd1JkAyxqUeqIxoRM0lWWw/uwBe453FiEKSpqZzdjvYpQ/Original/${type}-Edit_LINUX_${version}.tar.gz";
|
||||
url = "https://cdn-media.empowertribe.com/9ba5bed1bc7a427cb96cef8aeb49f097/${type}-Edit_LINUX_${version}.tar.gz";
|
||||
hash = "sha256-cEva2Brxo7zm3qppO+BtYIlUqV9t69j+8f6g94C4i3c=";
|
||||
homepage = "https://www.midasconsoles.com/series.html?category=R-MIDAS-M32SERIES";
|
||||
homepage = "https://www.midasconsoles.com/en/products/0603-AEO";
|
||||
}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ callPackage ./generic.nix (
|
|||
brand = "Behringer";
|
||||
type = "X32";
|
||||
version = "4.4.1";
|
||||
url = "https://cdn.mediavalet.com/aunsw/musictribe/6-vOpP2lRkyNSDXgZEUbQA/FyIw4jc3bk60nseai05MBQ/Original/${type}-Edit_LINUX_${version}.tar.gz";
|
||||
url = "https://cdn-media.empowertribe.com/23b991ede2e6473d916c7ac56f53d71d/${type}-Edit_LINUX_${version}.tar.gz";
|
||||
hash = "sha256-HrSPDWnWF2s1U8Khj6VnLptPdcMVyTivewWAIIdArMc=";
|
||||
homepage = "https://www.behringer.com/product.html?modelCode=0603-ACE";
|
||||
homepage = "https://www.behringer.com/en/products/0603-ACE";
|
||||
}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
"chromium": {
|
||||
"version": "148.0.7778.167",
|
||||
"version": "148.0.7778.178",
|
||||
"chromedriver": {
|
||||
"version": "148.0.7778.168",
|
||||
"hash_darwin": "sha256-F24gaQI0JZkStM71KJDEn8EKBTw1UifMxYXDdUIVup4=",
|
||||
"hash_darwin_aarch64": "sha256-WpAiIz3nXxJLkxAP5JSn6rSxDW0vvl7EHeJA5MD+nss="
|
||||
"version": "148.0.7778.179",
|
||||
"hash_darwin": "sha256-jDw+ON0X8rePW1HLBZ5FVKMibImBuW/Tp0EDZ/UjJlw=",
|
||||
"hash_darwin_aarch64": "sha256-hNaaKMVy8sKNU444Uf78YI3ayUATrTBAr6/7Z3jewv0="
|
||||
},
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
|
|
@ -21,8 +21,8 @@
|
|||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "65db666ac2cf205fcc36db8bb5b9cd87f94808ac",
|
||||
"hash": "sha256-Vda6y35lHYP3xK9FT5FdsnfTtL0MiY2m/auSq6NyL0U=",
|
||||
"rev": "d096af1c9e98c45c3596e59620622b1a049bfecb",
|
||||
"hash": "sha256-XRalekzeALnDh9KiGqhYdhXvkGkjO3TOIZeqwpPLO+U=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
|
|
@ -92,8 +92,8 @@
|
|||
},
|
||||
"src/third_party/angle": {
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git",
|
||||
"rev": "6c71c70ec7e838c5f1712974086c8bc33d07de14",
|
||||
"hash": "sha256-35Zu8jSopO47pH1rNLtSq5I8QRsOkMMvTgtmD13Yw/Y="
|
||||
"rev": "50fd896fb21cca91f325812d01d1e971593efc73",
|
||||
"hash": "sha256-HcfKm7UQmg3wMDOytmaYzm7Z7gRdOrRoqAKaE0ZdI4E="
|
||||
},
|
||||
"src/third_party/angle/third_party/glmark2/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
||||
|
|
@ -392,8 +392,8 @@
|
|||
},
|
||||
"src/third_party/icu": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/icu.git",
|
||||
"rev": "ff7995a708a10ab44db101358083c7f74752da9f",
|
||||
"hash": "sha256-yQ55MGzqkVkp/arTlmKqySBvQFtaPaBk9UUAFE0imhE="
|
||||
"rev": "3859e64eed5d34544b27fbcab0ac1685ce83df3c",
|
||||
"hash": "sha256-rNErsn11FZUh8GXAl7jK+NyLHIKrQR3LuoM1qFFGtmM="
|
||||
},
|
||||
"src/third_party/nlohmann_json/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/nlohmann/json.git",
|
||||
|
|
@ -822,8 +822,8 @@
|
|||
},
|
||||
"src/v8": {
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||
"rev": "e38030f4228c8d1405fe105fc5feaa5173559e25",
|
||||
"hash": "sha256-VsJpsCfDGF6rlfYQXccgF+F/pBhY/ybUa9N5HnHJ2lU="
|
||||
"rev": "ad6e4525c418a92147c8247ef9d144ce4c242a38",
|
||||
"hash": "sha256-+cQdsWTgIohd3yOCsNCprSr4Ctes77fWGdmPxN2tQlM="
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -52,13 +52,27 @@ buildGoModule (finalAttrs: {
|
|||
|
||||
# skipping version tests because they require dot git directory
|
||||
substituteInPlace cmd/helm/version_test.go \
|
||||
--replace "TestVersion" "SkipVersion"
|
||||
--replace-fail "TestVersion" "SkipVersion"
|
||||
# skipping plugin tests
|
||||
substituteInPlace cmd/helm/plugin_test.go \
|
||||
--replace "TestPluginDynamicCompletion" "SkipPluginDynamicCompletion" \
|
||||
--replace "TestLoadPlugins" "SkipLoadPlugins"
|
||||
--replace-fail "TestPluginDynamicCompletion" "SkipPluginDynamicCompletion" \
|
||||
--replace-fail "TestLoadPlugins" "SkipLoadPlugins"
|
||||
substituteInPlace cmd/helm/helm_test.go \
|
||||
--replace "TestPluginExitCode" "SkipPluginExitCode"
|
||||
--replace-fail "TestPluginExitCode" "SkipPluginExitCode"
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# skipping as test fails in sandbox
|
||||
substituteInPlace cmd/helm/dependency_build_test.go \
|
||||
--replace-fail "TestDependencyBuildCmd" "SkipDependencyBuildCmd"
|
||||
substituteInPlace cmd/helm/dependency_update_test.go \
|
||||
--replace-fail "TestDependencyUpdateCmd" "SkipDependencyUpdateCmd"
|
||||
# skipping as test fails in sandbox
|
||||
substituteInPlace cmd/helm/install_test.go \
|
||||
--replace-fail "TestInstall" "SkipInstall"
|
||||
# skipping as test fails in sandbox
|
||||
substituteInPlace cmd/helm/pull_test.go \
|
||||
--replace-fail "TestPullCmd" "SkipPullCmd" \
|
||||
--replace-fail "TestPullWithCredentialsCmd" "SkipPullWithCredentialsCmd"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@
|
|||
+ lib.optionalString (rustTargetPlatform != rustHostPlatform) ''
|
||||
"CC_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${ccForTarget}" \
|
||||
"CXX_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${cxxForTarget}" \
|
||||
"CARGO_TARGET_${stdenv.targetPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForTarget}"
|
||||
"CARGO_TARGET_${stdenv.targetPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForTarget}" \
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,14 +43,14 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "7zz";
|
||||
version = "26.00";
|
||||
version = "26.01";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}-src.tar.xz";
|
||||
hash =
|
||||
{
|
||||
free = "sha256-p914FrQPb+h1a+7YIL8ms2YoIfoS1hTCeLLeBF4DjwY=";
|
||||
unfree = "sha256-CIgPhjRSE9A0ABQQx1YTZgO+DNb3BDxRo5xOQmuzBuI=";
|
||||
free = "sha256-52+Gg66MOFmwYUVB0OO4PAtZJtQOkoVpxV7F9xBGy58=";
|
||||
unfree = "sha256-w0fk8EDusUYiOfrmIiUq+xevlwfQxMhjdPzfkHkOkR8=";
|
||||
}
|
||||
.${if enableUnfree then "unfree" else "free"};
|
||||
stripRoot = false;
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "abracadabra";
|
||||
version = "4.0.1";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KejPi";
|
||||
repo = "AbracaDABra";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Jkbeu5KW4fB1d3RRCBO79ZeujrbzHuVu9kQ3EuwVHoE=";
|
||||
hash = "sha256-6MraWIon5bqLmqwLodZXys4Lz+kamFhIa03+eVsApqk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
44
pkgs/by-name/ad/adaptagrams/package.nix
Normal file
44
pkgs/by-name/ad/adaptagrams/package.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
cairomm,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "adaptagrams";
|
||||
version = "0-unstable-2025-10-28";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mjwybrow";
|
||||
repo = "adaptagrams";
|
||||
rev = "840ebcff20dbba36ad03a2160edf7cbaf9859984";
|
||||
hash = "sha256-7tzDOass0ea+6vnfyA/jl2k6VWHCMtkE2I/eTeCFiYQ=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/cola";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cairomm
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Libraries for constraint-based layout and connector routing for diagrams.";
|
||||
homepage = "https://github.com/mjwybrow/adaptagrams";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
wishstudio
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
75
pkgs/by-name/br/brlcad/disable-rpath-manipulation.patch
Normal file
75
pkgs/by-name/br/brlcad/disable-rpath-manipulation.patch
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 7526f05b70..18871afb75 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -356,20 +356,6 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
|
||||
# directories outside the build tree to the install RPATH
|
||||
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||
|
||||
-# The following logic is what allows binaries to run successfully in the build
|
||||
-# directory AND install directory.
|
||||
-# This will need to be overridden for some targets that have a different
|
||||
-# relative position to LIB_DIR using the INSTALL_RPATH target property.
|
||||
-# However, we can cover the most common case for RPATH setting using the
|
||||
-# global default.
|
||||
-if(NOT APPLE)
|
||||
- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}:$ORIGIN/../${LIB_DIR}")
|
||||
-else(NOT APPLE)
|
||||
- # For OSX, use the INSTALL_NAME_DIR target property
|
||||
- set(CMAKE_INSTALL_RPATH "@executable_path/../${LIB_DIR}")
|
||||
- set(CMAKE_INSTALL_NAME_DIR "@executable_path/../${LIB_DIR}")
|
||||
-endif(NOT APPLE)
|
||||
-
|
||||
#---------------------------------------------------------------------
|
||||
# For certain platforms (in particular Visual C++) we want to keep some pre-defined
|
||||
# flags that are commonly used in the build logic.
|
||||
diff --git a/misc/CMake/BRLCAD_ExternalDeps.cmake b/misc/CMake/BRLCAD_ExternalDeps.cmake
|
||||
index fdce1dc0c0..1375de50d1 100644
|
||||
--- a/misc/CMake/BRLCAD_ExternalDeps.cmake
|
||||
+++ b/misc/CMake/BRLCAD_ExternalDeps.cmake
|
||||
@@ -752,15 +752,6 @@ function(brlcad_bext_process)
|
||||
string(REPLACE ";" "\n" TP_B "${ALL_BINARY_FILES}")
|
||||
file(WRITE "${TP_INVENTORY_BINARIES}" "${TP_B}")
|
||||
|
||||
- if(NBINARY_FILES)
|
||||
- message("Setting rpath on new 3rd party lib and exe files...")
|
||||
- # Set local RPATH so the files will work during build
|
||||
- foreach(lf ${NBINARY_FILES})
|
||||
- rpath_build_dir_process("${CMAKE_BINARY_DIR}" "${lf}")
|
||||
- endforeach(lf ${NBINARY_FILES})
|
||||
- message("Setting rpath on new 3rd party lib and exe files... done.")
|
||||
- endif(NBINARY_FILES)
|
||||
-
|
||||
if(NNOEXEC_FILES)
|
||||
message("Scrubbing paths from new 3rd party data files...")
|
||||
foreach(tf ${NNOEXEC_FILES})
|
||||
@@ -864,6 +855,7 @@ function(brlcad_bext_process)
|
||||
# to define an RPATH that will allow the binary files to work when
|
||||
# the install directory is relocated.
|
||||
foreach(bf ${ALL_BINARY_FILES})
|
||||
+ continue()
|
||||
if(IS_SYMLINK ${bf})
|
||||
continue()
|
||||
endif(IS_SYMLINK ${bf})
|
||||
diff --git a/misc/CMake/BRLCAD_Util.cmake b/misc/CMake/BRLCAD_Util.cmake
|
||||
index 631909f499..43a536d21d 100644
|
||||
--- a/misc/CMake/BRLCAD_Util.cmake
|
||||
+++ b/misc/CMake/BRLCAD_Util.cmake
|
||||
@@ -154,17 +154,6 @@ function(PLUGIN_SETUP plugin_targets subdir)
|
||||
LIBRARY DESTINATION ${LIBEXEC_DIR}/${subdir}
|
||||
ARCHIVE DESTINATION ${LIBEXEC_DIR}/${subdir}
|
||||
)
|
||||
- # Set the RPATH target property
|
||||
- if(NOT APPLE)
|
||||
- set_property(
|
||||
- TARGET ${target_name}
|
||||
- PROPERTY INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}:$ORIGIN/../../${LIB_DIR}"
|
||||
- )
|
||||
- else(NOT APPLE)
|
||||
- # For OSX, set the INSTALL_NAME_DIR target property
|
||||
- set_property(TARGET ${target_name} PROPERTY INSTALL_RPATH "@executable_path/../../${LIB_DIR}")
|
||||
- set_property(TARGET ${target_name} PROPERTY INSTALL_NAME_DIR "@executable_path/../../${LIB_DIR}")
|
||||
- endif(NOT APPLE)
|
||||
endforeach(target_name${plugins})
|
||||
endfunction(PLUGIN_SETUP)
|
||||
|
||||
13
pkgs/by-name/br/brlcad/fix-export.patch
Normal file
13
pkgs/by-name/br/brlcad/fix-export.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/src/tclscripts/lib/GeometryIO.tcl b/src/tclscripts/lib/GeometryIO.tcl
|
||||
index 1ca6898ec1..b8fd8bf9a7 100644
|
||||
--- a/src/tclscripts/lib/GeometryIO.tcl
|
||||
+++ b/src/tclscripts/lib/GeometryIO.tcl
|
||||
@@ -176,7 +176,7 @@ proc geom_load {input_file gui_feedback} {
|
||||
# and may only want a subset.
|
||||
proc geom_save {input_file output_file db_component} {
|
||||
|
||||
- set binpath [bu_dir bin] ]
|
||||
+ set binpath [bu_dir bin]
|
||||
|
||||
set output_filename [file tail $output_file]
|
||||
set output_dir [file dirname $output_file]
|
||||
38
pkgs/by-name/br/brlcad/fix-findpackage-root.patch
Normal file
38
pkgs/by-name/br/brlcad/fix-findpackage-root.patch
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
diff --git a/misc/CMake/BRLCAD_ExternalDeps.cmake b/misc/CMake/BRLCAD_ExternalDeps.cmake
|
||||
index 1375de50d1..da7f8b2677 100644
|
||||
--- a/misc/CMake/BRLCAD_ExternalDeps.cmake
|
||||
+++ b/misc/CMake/BRLCAD_ExternalDeps.cmake
|
||||
@@ -1037,7 +1037,8 @@ macro(find_package_opencv)
|
||||
unset(OpenCV_ROOT)
|
||||
|
||||
# If no bundled copy, see what the system has
|
||||
- if(NOT OpenCV_FOUND)
|
||||
+ #if(NOT OpenCV_FOUND)
|
||||
+ if(TRUE)
|
||||
set(OpenCV_DIR "${OpenCV_DIR_TMP}")
|
||||
if(F_REQUIRED)
|
||||
find_package(OpenCV REQUIRED)
|
||||
@@ -1072,7 +1073,7 @@ macro(find_package_tcl)
|
||||
unset(TTK_STUB_LIBRARY CACHE)
|
||||
endif(RESET_TP)
|
||||
|
||||
- set(TCL_ROOT "${CMAKE_BINARY_DIR}")
|
||||
+ set(TCL_ROOT "${TCL_ROOT};${CMAKE_BINARY_DIR}")
|
||||
if(F_REQUIRED)
|
||||
find_package(TCL REQUIRED)
|
||||
else()
|
||||
diff --git a/misc/CMake/BRLCAD_Find_Package.cmake b/misc/CMake/BRLCAD_Find_Package.cmake
|
||||
index 930b444bc4..41717d503d 100644
|
||||
--- a/misc/CMake/BRLCAD_Find_Package.cmake
|
||||
+++ b/misc/CMake/BRLCAD_Find_Package.cmake
|
||||
@@ -62,8 +62,8 @@ macro(BRLCAD_Find_Package pkg_name)
|
||||
set(${pkg_name}_ROOT "${BRLCAD_EXT_NOINSTALL_DIR}")
|
||||
set(${pkg_upper}_ROOT "${BRLCAD_EXT_NOINSTALL_DIR}")
|
||||
else(F_NOINSTALL)
|
||||
- set(${pkg_name}_ROOT "${CMAKE_BINARY_DIR}")
|
||||
- set(${pkg_upper}_ROOT "${CMAKE_BINARY_DIR}")
|
||||
+ set(${pkg_name}_ROOT "${${pkg_name}_ROOT};${CMAKE_BINARY_DIR}")
|
||||
+ set(${pkg_upper}_ROOT "${${pkg_upper}_ROOT};${CMAKE_BINARY_DIR}")
|
||||
endif(F_NOINSTALL)
|
||||
|
||||
# Clear the old status value, if any
|
||||
13
pkgs/by-name/br/brlcad/fix-gdal-strcasecmp.patch
Normal file
13
pkgs/by-name/br/brlcad/fix-gdal-strcasecmp.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/src/libgcv/plugins/gdal/gdal.cpp b/src/libgcv/plugins/gdal/gdal.cpp
|
||||
index c5ae693cb0..56e9ba15eb 100644
|
||||
--- a/src/libgcv/plugins/gdal/gdal.cpp
|
||||
+++ b/src/libgcv/plugins/gdal/gdal.cpp
|
||||
@@ -42,6 +42,8 @@
|
||||
#include <stdexcept>
|
||||
|
||||
/* GDAL headers */
|
||||
+// Split the name to evade regress repocheck
|
||||
+#define STRCASECMP(a, b) (str ## casecmp(a, b))
|
||||
#include "gdal.h"
|
||||
#include "gdalwarper.h"
|
||||
#include "gdal_utils.h"
|
||||
15
pkgs/by-name/br/brlcad/fix-perm-test-cmake.patch
Normal file
15
pkgs/by-name/br/brlcad/fix-perm-test-cmake.patch
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
diff --git a/src/tclscripts/CMakeLists.txt b/src/tclscripts/CMakeLists.txt
|
||||
index 364d529ff0..7626e26e68 100644
|
||||
--- a/src/tclscripts/CMakeLists.txt
|
||||
+++ b/src/tclscripts/CMakeLists.txt
|
||||
@@ -139,7 +139,9 @@ if(TARGET btclsh)
|
||||
)
|
||||
add_custom_target(TclIndexBld ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tclindexbld.sentinel)
|
||||
distclean(${CMAKE_CURRENT_BINARY_DIR}/tclindexbld.sentinel)
|
||||
- set_target_properties(perm_test PROPERTIES FOLDER "Compilation Utilities")
|
||||
+ if(BUILD_TESTING)
|
||||
+ set_target_properties(perm_test PROPERTIES FOLDER "Compilation Utilities")
|
||||
+ endif()
|
||||
|
||||
foreach(ifile ${index_install_files})
|
||||
# Install logic for index file.
|
||||
|
|
@ -3,67 +3,227 @@
|
|||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
fontconfig,
|
||||
libx11,
|
||||
libxi,
|
||||
freetype,
|
||||
libgbm,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
# nativeBuildInputs
|
||||
cmake,
|
||||
doxygen,
|
||||
lemon,
|
||||
libxslt,
|
||||
re2c,
|
||||
|
||||
# buildInputs
|
||||
adaptagrams,
|
||||
assimp,
|
||||
clipper2,
|
||||
eigen,
|
||||
gdal,
|
||||
geogram,
|
||||
gtmathematics,
|
||||
libGL,
|
||||
libjpeg_turbo,
|
||||
libpng,
|
||||
lmdb,
|
||||
netpbm,
|
||||
opencv,
|
||||
openmesh,
|
||||
pugixml,
|
||||
qt6,
|
||||
stepcode,
|
||||
tcl,
|
||||
tinygltf,
|
||||
tk,
|
||||
zlib,
|
||||
|
||||
# nativeCheckInputs
|
||||
gzip,
|
||||
which,
|
||||
|
||||
# build options
|
||||
enableQt ? false,
|
||||
}:
|
||||
let
|
||||
bext = fetchFromGitHub {
|
||||
owner = "BRL-CAD";
|
||||
repo = "bext";
|
||||
rev = "f9074f84c87605f89d912069cee1b1e710ead635"; # must match brlcad_bext_init() in CMakeLists.txt
|
||||
hash = "sha256-jCBw4aDk/bmz2Woe9qIA88mgLRRZSu7zDYM5pi3MbP8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "brlcad";
|
||||
version = "7.38.2";
|
||||
version = "7.42.2";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BRL-CAD";
|
||||
repo = "brlcad";
|
||||
tag = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}";
|
||||
hash = "sha256-23UTeH4gY2x/QGYZ64glAkf6LmsXBAppIOHgoUdxgpo=";
|
||||
tag = "rel-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
|
||||
hash = "sha256-smsCbUWlAfO9xyT8Bz/vLRkTJuehF9xANrP8bT//t18=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
# clone bext src so we can patch it
|
||||
mkdir -p build/bext
|
||||
cp -r --no-preserve=mode ${bext}/* build/bext/
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# This commit was bringing an impurity in the rpath resulting in:
|
||||
# RPATH of binary /nix/store/rq2hjvfgq2nvh5zxch51ij34rqqdpark-brlcad-7.38.0/bin/tclsh contains a forbidden reference to /build/
|
||||
# make libgcv work with modern lemon
|
||||
(fetchpatch {
|
||||
url = "https://github.com/BRL-CAD/brlcad/commit/fbdbf042b2db4c7d46839a17bbf4985cdb81f0ae.patch";
|
||||
revert = true;
|
||||
hash = "sha256-Wfihd7TLkE8aOpLdDtYmhhd7nZijiVGh1nbUjWr/BjQ=";
|
||||
url = "https://github.com/BRL-CAD/brlcad/commit/0dbd82a10040edc45754242ab36ed130a0259fb8.patch";
|
||||
hash = "sha256-N54FnF69PgeRUDZk/i9hoLHoBzb1neYN20KhDyMqvi4=";
|
||||
excludes = [ "CMakeLists.txt" ];
|
||||
})
|
||||
# disable internal RPATH manipulation which gets in our way
|
||||
./disable-rpath-manipulation.patch
|
||||
# make <PACKAGE>_ROOT respect our cmakeFlags settings instead of being hardwired to CMAKE_BINARY_DIR
|
||||
./fix-findpackage-root.patch
|
||||
# libgcv defines EQUAL macro, which causes gdal to not define STRCASECMP macro
|
||||
./fix-gdal-strcasecmp.patch
|
||||
# only call set_target_properties on perm-test when testing is enabled
|
||||
# https://github.com/BRL-CAD/brlcad/pull/235
|
||||
./fix-perm-test-cmake.patch
|
||||
# fix typo in GeometryIO.tcl which causes model exports to fail
|
||||
# https://github.com/BRL-CAD/brlcad/pull/234
|
||||
./fix-export.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# disable all bext projects by default
|
||||
substituteInPlace build/bext/CMakeLists.txt \
|
||||
--replace-fail "add_project" "#add_project"
|
||||
|
||||
# enable bext projects we actually need:
|
||||
# * itcl: needs v3
|
||||
# * itk: needs v3
|
||||
# * iwidgets, tkhtml, tktable: missing in nixpkgs
|
||||
# * manifold: needs v2
|
||||
# * opennurbs: many vendored patches
|
||||
# * osmesa, perplex, regex, utahrle: specialized vendored libraries
|
||||
# * patch, strclear: required internally
|
||||
# * assetimport, lemon, re2c, tcl, tk, zlib: transitive dependency, not actually built
|
||||
substituteInPlace build/bext/CMakeLists.txt \
|
||||
--replace-fail "#add_project(patch)" "add_project(patch)"
|
||||
for name in itcl itk iwidgets tkhtml tktable manifold opennurbs osmesa perplex regex utahrle strclear zlib assetimport lemon re2c tcl tk; do
|
||||
substituteInPlace build/bext/CMakeLists.txt \
|
||||
--replace-fail "#add_project($name " "add_project($name "
|
||||
done
|
||||
|
||||
# inject TCL_ROOT into bext projects
|
||||
sed -i '1i set(TCL_ROOT "${tcl};${tk}")' \
|
||||
build/bext/CMake/FindTCL.cmake \
|
||||
build/bext/itcl/addfiles/FindTCL.cmake \
|
||||
build/bext/itk/addfiles/FindTCL.cmake \
|
||||
build/bext/tktable/tktable/CMake/FindTCL.cmake \
|
||||
build/bext/tkhtml/tkhtml/CMake/FindTCL.cmake
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isAarch64 ''
|
||||
# remove a failing test
|
||||
substituteInPlace src/libbu/tests/CMakeLists.txt \
|
||||
--replace-fail "brlcad_add_test(NAME bu_color_to_rgb_floats_1 COMMAND bu_test color 4 192,78,214)" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
doxygen
|
||||
lemon
|
||||
libxslt
|
||||
re2c
|
||||
]
|
||||
++ lib.optionals enableQt [
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fontconfig
|
||||
libx11
|
||||
libxi
|
||||
freetype
|
||||
libgbm
|
||||
adaptagrams
|
||||
assimp
|
||||
clipper2
|
||||
eigen
|
||||
gdal
|
||||
geogram
|
||||
gtmathematics
|
||||
libGL
|
||||
libjpeg_turbo
|
||||
libpng
|
||||
lmdb
|
||||
netpbm
|
||||
opencv
|
||||
openmesh
|
||||
pugixml
|
||||
stepcode
|
||||
tcl
|
||||
tinygltf
|
||||
tk
|
||||
zlib
|
||||
]
|
||||
++ lib.optionals enableQt [
|
||||
qt6.qtbase
|
||||
qt6.qtsvg
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBRLCAD_ENABLE_STRICT=OFF"
|
||||
(lib.cmakeBool "BRLCAD_ENABLE_STRICT" false)
|
||||
(lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck)
|
||||
(lib.cmakeBool "BRLCAD_ENABLE_QT" enableQt)
|
||||
(lib.cmakeFeature "GTE_INCLUDE_DIR" "${gtmathematics}/include/gtmathematics")
|
||||
(lib.cmakeFeature "LMDB_LIBRARY" "${lmdb.out}/lib/liblmdb${stdenv.hostPlatform.extensions.sharedLibrary}")
|
||||
(lib.cmakeFeature "LMDB_INCLUDE_DIR" "${lmdb.dev}/include")
|
||||
(lib.cmakeFeature "OpenCV_DIR" "${opencv}/lib/cmake/opencv4")
|
||||
(lib.cmakeFeature "STEPCODE_ROOT" "${stepcode}")
|
||||
(lib.cmakeFeature "TCL_ROOT" "${tcl};${tk}")
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=array-bounds"
|
||||
preConfigure = ''
|
||||
cmakeFlagsArray+=("-DBRLCAD_EXT_SOURCE_DIR=$(pwd)/build/bext")
|
||||
'';
|
||||
|
||||
env = {
|
||||
CXXFLAGS = toString [
|
||||
# src/libbg/spsr/Octree.inl
|
||||
"-Wno-template-body"
|
||||
# manifold: clipper.core.h:181:22: error: template-id not allowed for constructor in C++20
|
||||
"-Wno-error=template-id-cdtor"
|
||||
];
|
||||
CFLAGS = toString [
|
||||
# itk, tkhtml, tktable, utahrle
|
||||
"-Wno-incompatible-pointer-types"
|
||||
"-std=gnu17"
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
gzip
|
||||
which
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# Only wrap Qt apps as other executables stop working when wrapped
|
||||
dontWrapQtApps = true;
|
||||
preFixup = lib.optionalString enableQt ''
|
||||
wrapQtApp $out/bin/brlman
|
||||
wrapQtApp $out/bin/qged
|
||||
wrapQtApp $out/bin/qgmodel
|
||||
wrapQtApp $out/bin/qgview
|
||||
wrapQtApp $out/bin/qisst
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://brlcad.org";
|
||||
description = "BRL-CAD is a powerful cross-platform open source combinatorial solid modeling system";
|
||||
changelog = "https://github.com/BRL-CAD/brlcad/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
|
||||
changelog = "https://github.com/BRL-CAD/brlcad/releases/tag/${finalAttrs.src.tag}";
|
||||
license = with lib.licenses; [
|
||||
lgpl21
|
||||
bsd2
|
||||
];
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
platforms = lib.platforms.linux;
|
||||
# error Exactly one of ON_LITTLE_ENDIAN or ON_BIG_ENDIAN should be defined.
|
||||
broken = stdenv.system == "aarch64-linux";
|
||||
maintainers = with lib.maintainers; [
|
||||
GaetanLepage
|
||||
wishstudio
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -248,6 +248,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
# eglInitialize: Failed to get system egl display
|
||||
# Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory
|
||||
"test_recipe_browser_webengine"
|
||||
# Flaky test, occasionally errors with python exception:
|
||||
# urllib.error.URLError: <urlopen error NetworkError.RemoteHostClosedError: Connection closed>
|
||||
"test_recipe_browser_qt"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isAarch64 [
|
||||
# https://github.com/microsoft/onnxruntime/issues/10038
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
xrelkd
|
||||
bot-wxt1221
|
||||
];
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
mainProgram = "clipcatd";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,78 +0,0 @@
|
|||
{
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
lib,
|
||||
stdenv,
|
||||
autoreconfHook,
|
||||
intltool,
|
||||
pkg-config,
|
||||
gtk3,
|
||||
libayatana-appindicator,
|
||||
xdotool,
|
||||
which,
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "clipit";
|
||||
version = "1.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CristianHenzel";
|
||||
repo = "ClipIt";
|
||||
rev = "45e2ea386d04dbfc411ea370299502450d589d0c";
|
||||
sha256 = "0byqz9hanwmdc7i55xszdby2iqrk93lws7hmjda2kv17g34apwl7";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
intltoolize --copy --force --automake
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# Fixes for GCC14
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/debian/clipit/-/raw/d4bafc28fcb445d1940cdfede6c70142cf3162f5/debian/patches/incompatible-pointer-types.patch";
|
||||
hash = "sha256-STI1fpnoPdEqu1embQcUlTG712HPbJ+LPm930P13Ixo=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/debian/clipit/-/raw/656d0814030c13437b10d40ee75615d0e8cd873e/debian/patches/missing-prototypes.patch";
|
||||
hash = "sha256-UD183IjV5BprPHQK9bhmUBKfUYgqEZ9M1cRE+AmhAPA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
autoreconfHook
|
||||
intltool
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-gtk3"
|
||||
"--enable-appindicator=yes"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
libayatana-appindicator
|
||||
];
|
||||
|
||||
gappsWrapperArgs = [
|
||||
"--prefix"
|
||||
"PATH"
|
||||
":"
|
||||
"${lib.makeBinPath [
|
||||
xdotool
|
||||
which
|
||||
]}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Lightweight GTK Clipboard Manager";
|
||||
inherit (finalAttrs.src.meta) homepage;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "clipit";
|
||||
maintainers = with lib.maintainers; [ kamilchm ];
|
||||
};
|
||||
})
|
||||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cloudflared";
|
||||
version = "2026.3.0";
|
||||
version = "2026.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cloudflared";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-oGe6ZZeIcFC+ST78m54upFJmbPL2udwtFHaC8vrH4cg=";
|
||||
hash = "sha256-3Znww+QsG7voek6XfwXVUmHCG+dIrMif2rMZXpZyNn0=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
@ -68,6 +68,11 @@ buildGoModule (finalAttrs: {
|
|||
# Should be false
|
||||
substituteInPlace "datagramsession/manager_test.go" \
|
||||
--replace-warn "TestManagerCtxDoneCloseSessions" "SkipManagerCtxDoneCloseSessions"
|
||||
|
||||
# Workaround for: curves_test.go:121:
|
||||
# Should be true
|
||||
substituteInPlace "crypto/curves_test.go" \
|
||||
--replace-warn "TestSupportedCurvesNegotiation" "SkipSupportedCurvesNegotiation"
|
||||
'';
|
||||
|
||||
doCheck = !stdenv.hostPlatform.isDarwin;
|
||||
|
|
|
|||
139
pkgs/by-name/fr/frama-c/package.nix
Normal file
139
pkgs/by-name/fr/frama-c/package.nix
Normal file
|
|
@ -0,0 +1,139 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
darwin,
|
||||
fetchurl,
|
||||
graphviz,
|
||||
doxygen,
|
||||
ocamlPackages,
|
||||
coq,
|
||||
dune,
|
||||
why3,
|
||||
gdk-pixbuf,
|
||||
wrapGAppsHook3,
|
||||
withGui ? true,
|
||||
withWP ? true,
|
||||
withMarkdown ? true,
|
||||
withApron ? true,
|
||||
withZeroMQ ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "frama-c";
|
||||
version = "32.1";
|
||||
slang = "Germanium";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://frama-c.com/download/frama-c-${finalAttrs.version}-${finalAttrs.slang}.tar.gz";
|
||||
hash = "sha256-3V1uid9d3mpAs4vq0wLQpbmGCxw7ZbzYU2CneAh8E+I=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace src/dune --replace-fail " bytes " " "
|
||||
substituteInPlace Makefile --replace-fail "include ivette/Makefile.installation" ""
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook3
|
||||
dune
|
||||
]
|
||||
++ (with ocamlPackages; [
|
||||
ocaml
|
||||
findlib
|
||||
menhir
|
||||
])
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.sigtool
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
with ocamlPackages;
|
||||
[
|
||||
camlzip
|
||||
dune-configurator
|
||||
dune-site
|
||||
menhirLib
|
||||
ocamlgraph
|
||||
ppx_deriving
|
||||
ppx_deriving_yaml
|
||||
ppx_inline_test
|
||||
unionFind
|
||||
yojson
|
||||
zarith
|
||||
]
|
||||
++ lib.optionals withGui [
|
||||
lablgtk3
|
||||
lablgtk3-sourceview3
|
||||
]
|
||||
++ lib.optionals withWP [
|
||||
why3
|
||||
]
|
||||
++ lib.optionals withMarkdown [
|
||||
ppx_deriving_yojson
|
||||
]
|
||||
++ lib.optionals withApron [
|
||||
apron
|
||||
]
|
||||
++ lib.optionals withZeroMQ [
|
||||
zmq
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
dune build ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} --release @install
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
preFixup =
|
||||
let
|
||||
runtimeDeps =
|
||||
with ocamlPackages;
|
||||
finalAttrs.buildInputs
|
||||
++ [
|
||||
bigarray-compat
|
||||
mlgmpidl
|
||||
parsexp
|
||||
re
|
||||
seq
|
||||
sexplib
|
||||
]
|
||||
++ lib.optionals withWP [
|
||||
why3.dev
|
||||
]
|
||||
++ lib.optionals withApron [
|
||||
apron.dev
|
||||
];
|
||||
|
||||
ocamlPath = lib.makeSearchPath "/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib" runtimeDeps;
|
||||
in
|
||||
''
|
||||
gappsWrapperArgs+=(--prefix OCAMLPATH ':' ${ocamlPath}:$out/lib/)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Extensible and collaborative platform dedicated to source-code analysis of C software";
|
||||
longDescription = ''
|
||||
Frama-C is an open-source extensible and collaborative platform
|
||||
dedicated to source-code analysis of C software. The Frama-C
|
||||
analyzers assist you in various source-code-related activities,
|
||||
from the navigation through unfamiliar projects up to the
|
||||
certification of critical software.
|
||||
'';
|
||||
homepage = "https://www.frama-c.com/index.html";
|
||||
license = lib.licenses.lgpl21;
|
||||
maintainers = with lib.maintainers; [
|
||||
thoughtpolice
|
||||
amiddelk
|
||||
luc65r
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "frama-c";
|
||||
broken = !lib.versionAtLeast ocamlPackages.ocaml.version "4.14";
|
||||
};
|
||||
})
|
||||
|
|
@ -1,143 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
writeText,
|
||||
graphviz,
|
||||
doxygen,
|
||||
ocamlPackages,
|
||||
ltl2ba,
|
||||
coq,
|
||||
dune,
|
||||
why3,
|
||||
gdk-pixbuf,
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
let
|
||||
mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib";
|
||||
runtimeDeps = with ocamlPackages; [
|
||||
apron.dev
|
||||
bigarray-compat
|
||||
biniou
|
||||
camlzip
|
||||
easy-format
|
||||
menhirLib
|
||||
mlgmpidl
|
||||
num
|
||||
ocamlgraph
|
||||
ppx_deriving
|
||||
ppx_deriving_yojson
|
||||
ppx_import
|
||||
stdlib-shims
|
||||
why3.dev
|
||||
re
|
||||
result
|
||||
seq
|
||||
sexplib
|
||||
sexplib0
|
||||
parsexp
|
||||
base
|
||||
unionFind
|
||||
yojson
|
||||
zarith
|
||||
];
|
||||
ocamlpath = lib.concatMapStringsSep ":" mkocamlpath runtimeDeps;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "frama-c";
|
||||
version = "31.0";
|
||||
slang = "Gallium";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://frama-c.com/download/frama-c-${version}-${slang}.tar.gz";
|
||||
hash = "sha256-qUOE8A1TeRy7S02Dq0Fge8cZYtQkYfAtcRFsT/bcpWc=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace src/dune --replace-warn " bytes " " "
|
||||
'';
|
||||
|
||||
postConfigure = "patchShebangs ivette/api.sh";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook3
|
||||
dune
|
||||
]
|
||||
++ (with ocamlPackages; [
|
||||
ocaml
|
||||
findlib
|
||||
menhir
|
||||
]);
|
||||
|
||||
buildInputs = with ocamlPackages; [
|
||||
camlzip
|
||||
dune-site
|
||||
dune-configurator
|
||||
ocamlgraph
|
||||
yojson
|
||||
menhirLib
|
||||
lablgtk3
|
||||
lablgtk3-sourceview3
|
||||
coq
|
||||
graphviz
|
||||
zarith
|
||||
apron
|
||||
why3
|
||||
mlgmpidl
|
||||
doxygen
|
||||
ppx_deriving
|
||||
ppx_deriving_yaml
|
||||
ppx_deriving_yojson
|
||||
gdk-pixbuf
|
||||
unionFind
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
dune build -j$NIX_BUILD_CORES --release @install
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(--prefix OCAMLPATH ':' ${ocamlpath}:$out/lib/)
|
||||
'';
|
||||
|
||||
# Allow loading of external Frama-C plugins
|
||||
setupHook = writeText "setupHook.sh" ''
|
||||
addFramaCPath () {
|
||||
if test -d "''$1/lib/frama-c/plugins"; then
|
||||
export FRAMAC_PLUGIN="''${FRAMAC_PLUGIN-}''${FRAMAC_PLUGIN:+:}''$1/lib/frama-c/plugins"
|
||||
export OCAMLPATH="''${OCAMLPATH-}''${OCAMLPATH:+:}''$1/lib/frama-c/plugins"
|
||||
fi
|
||||
|
||||
if test -d "''$1/lib/frama-c"; then
|
||||
export OCAMLPATH="''${OCAMLPATH-}''${OCAMLPATH:+:}''$1/lib/frama-c"
|
||||
fi
|
||||
|
||||
if test -d "''$1/share/frama-c/"; then
|
||||
export FRAMAC_EXTRA_SHARE="''${FRAMAC_EXTRA_SHARE-}''${FRAMAC_EXTRA_SHARE:+:}''$1/share/frama-c"
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
addEnvHooks "$targetOffset" addFramaCPath
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Extensible and collaborative platform dedicated to source-code analysis of C software";
|
||||
homepage = "http://frama-c.com/";
|
||||
license = lib.licenses.lgpl21;
|
||||
maintainers = with lib.maintainers; [
|
||||
thoughtpolice
|
||||
amiddelk
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
broken = !lib.versionAtLeast ocamlPackages.ocaml.version "4.14";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,121 @@
|
|||
From b8dc3f753bd2aefb192f95688dc12797bc041627 Mon Sep 17 00:00:00 2001
|
||||
From: Connor Baker <ConnorBaker01@gmail.com>
|
||||
Date: Tue, 19 May 2026 20:16:28 -0700
|
||||
Subject: [PATCH] Emit compare.fatbin and make -arch=compute_X conditional
|
||||
|
||||
cuModuleLoad accepts cubin/fatbin/PTX interchangeably, so the C++ side
|
||||
just needs the filename swap. The benefit is that callers wanting to
|
||||
target multiple architectures (or to opt into architecture-conditional
|
||||
sm_90a / family-specific compute_100f features) can now append -gencode
|
||||
flags via NVCCFLAGS; -ptx output is a single-arch text format with no
|
||||
way to multiplex more than one architecture into one file.
|
||||
|
||||
To let those callers fully control which architectures end up in the
|
||||
fatbin, guard the default -arch=compute_$(COMPUTE) entry behind a non-
|
||||
empty check. 'make COMPUTE=' now skips it; default 'make' and
|
||||
'make COMPUTE=86' behave exactly as before.
|
||||
|
||||
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
|
||||
---
|
||||
Dockerfile | 2 +-
|
||||
Makefile | 10 ++++++----
|
||||
README.md | 8 ++++++++
|
||||
gpu-burn.8 | 2 +-
|
||||
gpu_burn-drv.cpp | 2 +-
|
||||
5 files changed, 17 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/Dockerfile b/Dockerfile
|
||||
index 08e5202..1c46976 100644
|
||||
--- a/Dockerfile
|
||||
+++ b/Dockerfile
|
||||
@@ -12,7 +12,7 @@ RUN make
|
||||
FROM nvidia/cuda:${CUDA_VERSION}-runtime-${IMAGE_DISTRO}
|
||||
|
||||
COPY --from=builder /build/gpu_burn /app/
|
||||
-COPY --from=builder /build/compare.ptx /app/
|
||||
+COPY --from=builder /build/compare.fatbin /app/
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index ec54a19..d23425a 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -32,23 +32,25 @@ IMAGE_DISTRO ?= ubi8
|
||||
|
||||
override NVCCFLAGS ?=
|
||||
override NVCCFLAGS += -I${CUDAPATH}/include
|
||||
+ifneq ($(strip $(COMPUTE)),)
|
||||
override NVCCFLAGS += -arch=compute_$(subst .,,${COMPUTE})
|
||||
+endif
|
||||
|
||||
IMAGE_NAME ?= gpu-burn
|
||||
|
||||
.PHONY: clean
|
||||
|
||||
-gpu_burn: gpu_burn-drv.o compare.ptx
|
||||
+gpu_burn: gpu_burn-drv.o compare.fatbin
|
||||
g++ -o $@ $< -O3 ${LDFLAGS}
|
||||
|
||||
%.o: %.cpp
|
||||
g++ ${CFLAGS} -c $<
|
||||
|
||||
-%.ptx: %.cu
|
||||
- PATH="${PATH}:${CCPATH}:." ${NVCC} ${NVCCFLAGS} -ptx $< -o $@
|
||||
+%.fatbin: %.cu
|
||||
+ PATH="${PATH}:${CCPATH}:." ${NVCC} ${NVCCFLAGS} -fatbin $< -o $@
|
||||
|
||||
clean:
|
||||
- $(RM) *.ptx *.o gpu_burn
|
||||
+ $(RM) *.fatbin *.o gpu_burn
|
||||
|
||||
image:
|
||||
docker build --build-arg CUDA_VERSION=${CUDA_VERSION} --build-arg IMAGE_DISTRO=${IMAGE_DISTRO} -t ${IMAGE_NAME} .
|
||||
diff --git a/README.md b/README.md
|
||||
index ca95342..1b050bf 100644
|
||||
--- a/README.md
|
||||
+++ b/README.md
|
||||
@@ -37,6 +37,14 @@ To override this with a different value:
|
||||
|
||||
`make COMPUTE=<compute capability value>`
|
||||
|
||||
+`COMPUTE` selects a single virtual architecture for the default `-arch`
|
||||
+flag. For a fat binary targeting multiple architectures, or to opt into
|
||||
+architecture-conditional (`sm_90a`) or family-specific (`compute_100f`)
|
||||
+features, set `COMPUTE=` to suppress the default and drive the build
|
||||
+entirely from `-gencode` flags via `NVCCFLAGS`:
|
||||
+
|
||||
+`make COMPUTE= NVCCFLAGS='-gencode=arch=compute_86,code=sm_86 -gencode=arch=compute_90,code=sm_90'`
|
||||
+
|
||||
CFLAGS can be added when invoking make to add to the default
|
||||
list of compiler flags:
|
||||
|
||||
diff --git a/gpu-burn.8 b/gpu-burn.8
|
||||
index bf071a4..b1c46c4 100644
|
||||
--- a/gpu-burn.8
|
||||
+++ b/gpu-burn.8
|
||||
@@ -19,7 +19,7 @@ GPU Burn
|
||||
.br
|
||||
\fB\-i\fR N Execute only on GPU N
|
||||
.br
|
||||
-\fB\-c\fR FILE Use FILE as compare kernel. Default is compare.ptx
|
||||
+\fB\-c\fR FILE Use FILE as compare kernel. Default is compare.fatbin
|
||||
.br
|
||||
\fB\-stts\fR T Set timeout threshold to T seconds for using SIGTERM to abort child processes before using SIGKILL. Default is 30
|
||||
.br
|
||||
diff --git a/gpu_burn-drv.cpp b/gpu_burn-drv.cpp
|
||||
index eae3532..a66ec9a 100644
|
||||
--- a/gpu_burn-drv.cpp
|
||||
+++ b/gpu_burn-drv.cpp
|
||||
@@ -30,7 +30,7 @@
|
||||
// Matrices are SIZE*SIZE.. POT should be efficiently implemented in CUBLAS
|
||||
#define SIZE 8192ul
|
||||
#define USEMEM 0.9 // Try to allocate 90% of memory
|
||||
-#define COMPARE_KERNEL "compare.ptx"
|
||||
+#define COMPARE_KERNEL "compare.fatbin"
|
||||
|
||||
// Used to report op/s, measured through Visual Profiler, CUBLAS from CUDA 7.5
|
||||
// (Seems that they indeed take the naive dim^3 approach)
|
||||
--
|
||||
2.43.0
|
||||
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
inherit (lib.lists) last map optionals;
|
||||
inherit (lib.lists) optionals;
|
||||
inherit (lib.trivial) boolToString;
|
||||
inherit (config) cudaSupport;
|
||||
inherit (cudaPackages)
|
||||
|
|
@ -17,7 +17,7 @@ let
|
|||
cuda_nvcc
|
||||
libcublas
|
||||
;
|
||||
inherit (cudaPackages.flags) cudaCapabilities dropDots isJetsonBuild;
|
||||
inherit (cudaPackages.flags) gencodeString isJetsonBuild;
|
||||
in
|
||||
backendStdenv.mkDerivation {
|
||||
pname = "gpu-burn";
|
||||
|
|
@ -32,11 +32,14 @@ backendStdenv.mkDerivation {
|
|||
hash = "sha256-zaGzwpdvF9dw3RypBO+g6FhjOFN8/F9+yI1+lLxLjgs=";
|
||||
};
|
||||
|
||||
# TODO: drop once https://github.com/wilicc/gpu-burn/pull/148 lands.
|
||||
patches = [ ./0001-Emit-compare.fatbin-and-make-arch-compute_X-conditio.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace gpu_burn-drv.cpp \
|
||||
--replace-fail \
|
||||
'#define COMPARE_KERNEL "compare.ptx"' \
|
||||
'#define COMPARE_KERNEL "${placeholder "out"}/share/compare.ptx"'
|
||||
'#define COMPARE_KERNEL "compare.fatbin"' \
|
||||
'#define COMPARE_KERNEL "${placeholder "out"}/share/compare.fatbin"'
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail \
|
||||
'${"\${CUDAPATH}/bin/nvcc"}' \
|
||||
|
|
@ -58,15 +61,19 @@ backendStdenv.mkDerivation {
|
|||
makeFlags = [
|
||||
# NOTE: CUDAPATH assumes cuda_cudart is a single output containing all of lib, dev, and stubs.
|
||||
"CUDAPATH=${cuda_cudart}"
|
||||
"COMPUTE=${last (map dropDots cudaCapabilities)}"
|
||||
"IS_JETSON=${boolToString isJetsonBuild}"
|
||||
# Empty COMPUTE suppresses the Makefile's default -arch=compute_$(COMPUTE);
|
||||
# gencodeString below is the single source of truth for architectures.
|
||||
"COMPUTE="
|
||||
];
|
||||
|
||||
env.NVCCFLAGS = gencodeString;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/{bin,share}
|
||||
install -Dm755 gpu_burn $out/bin/
|
||||
install -Dm644 compare.ptx $out/share/
|
||||
install -Dm644 compare.fatbin $out/share/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
46
pkgs/by-name/gt/gtmathematics/package.nix
Normal file
46
pkgs/by-name/gt/gtmathematics/package.nix
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
}:
|
||||
let
|
||||
GTE_VERSION_MAJOR = "8";
|
||||
GTE_VERSION_MINOR = "2";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gtmathematics";
|
||||
version = "${GTE_VERSION_MAJOR}.${GTE_VERSION_MINOR}";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "davideberly";
|
||||
repo = "GeometricTools";
|
||||
tag = "GTE-version-${finalAttrs.version}";
|
||||
hash = "sha256-OmWcD3T9OoLd7WDyqCyCLl5TeNnLBm9xV7DJxnb4hJc=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/GTE/Mathematics";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "GTE_VERSION_MAJOR" "${GTE_VERSION_MAJOR}")
|
||||
(lib.cmakeFeature "GTE_VERSION_MINOR" "${GTE_VERSION_MINOR}")
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A collection of source code for computing in the fields of mathematics, geometry, graphics, image analysis and physics.";
|
||||
homepage = "https://www.geometrictools.com";
|
||||
license = lib.licenses.boost;
|
||||
maintainers = with lib.maintainers; [
|
||||
wishstudio
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
|
@ -13,16 +13,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "hyprshell";
|
||||
version = "4.10.0";
|
||||
version = "4.10.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "H3rmt";
|
||||
repo = "hyprshell";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/U+tHSyDhqqXZGcH1jFRbg82j3g/YR6KlLUoGtSXS8w=";
|
||||
hash = "sha256-33qau/UP4CHBwL/6damFBTjsy/6gX8Nuh87uuhmqVfA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-sQLyyugM5/AMplleophPGp8NoEc543cpl6xFMo1MUIo=";
|
||||
cargoHash = "sha256-6m0ZvZBO30DbhcBJQWBx3PoHeZuS2FKiGJhcJx1eEfo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook4
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation {
|
|||
}
|
||||
) selectedFamilies;
|
||||
postBuild = ''
|
||||
find "$out" \( -name hinted -or -name unhinted -or -name split \) -exec rm -fr {} +
|
||||
find "$out" \( -name unhinted -or -name split \) -exec rm -fr {} +
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
137
pkgs/by-name/iv/ivette/package.nix
Normal file
137
pkgs/by-name/iv/ivette/package.nix
Normal file
|
|
@ -0,0 +1,137 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchzip,
|
||||
fetchYarnDeps,
|
||||
yarn,
|
||||
fixup-yarn-lock,
|
||||
yarnConfigHook,
|
||||
nodejs_22,
|
||||
electron,
|
||||
frama-c,
|
||||
makeWrapper,
|
||||
makeBinaryWrapper,
|
||||
makeDesktopItem,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ivette";
|
||||
version = "32.1";
|
||||
slang = "Germanium";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
# Not fetchurl, because we need it unzipped before fetchYarnDeps
|
||||
src = fetchzip {
|
||||
url = "https://frama-c.com/download/frama-c-${finalAttrs.version}-${finalAttrs.slang}.tar.gz";
|
||||
hash = "sha256-D+OJy/pcOqSSexqHVsyCSLSHcMg8zbjKDfmqBZ8xvbk=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/ivette";
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/ivette/yarn.lock";
|
||||
hash = "sha256-1NRSTJkXZ1jvkB/7xI0+u4PmrEzKc3VVBdwM50PtznI=";
|
||||
};
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
yarnConfigHook
|
||||
nodejs_22
|
||||
yarn
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
makeWrapper
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
makeBinaryWrapper
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/frama-c/server.ts \
|
||||
--replace-fail "command = 'frama-c'" \
|
||||
"command = '${lib.getExe frama-c}'"
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
# From api.sh
|
||||
${lib.getExe frama-c} -server-tsc -server-tsc-out src
|
||||
|
||||
# Run configure.js and sandboxer.js
|
||||
make pkg
|
||||
|
||||
# From src/dome/template/makefile:103
|
||||
cp ./src/dome/template/react-virtualized.hacked.onScroll.js \
|
||||
./node_modules/react-virtualized/dist/es/WindowScroller/utils/onScroll.js
|
||||
|
||||
DOME=./src/dome DOME_ENV=app yarn --offline run build
|
||||
|
||||
# Workaround for Darwin
|
||||
cp -r ${electron.dist} electron-dist
|
||||
chmod -R u+w electron-dist
|
||||
|
||||
yarn --offline electron-builder --dir \
|
||||
-c.electronDist=electron-dist \
|
||||
-c.electronVersion=${electron.version}
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
mkdir -p "$out/share/lib/ivette"
|
||||
cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/ivette"
|
||||
|
||||
install -Dm444 static/icon.png $out/share/icons/hicolor/512x512/apps/ivette.png
|
||||
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/ivette" \
|
||||
--add-flags "$out/share/lib/ivette/resources/app.asar" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--add-flags "--no-sandbox" \
|
||||
--inherit-argv0
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
cp -r dist/mac*/Ivette.app "$out/Applications/Ivette.app"
|
||||
makeWrapper "$out/Applications/Ivette.app/Contents/MacOS/Ivette" "$out/bin/ivette"
|
||||
''
|
||||
+ ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = lib.optional stdenv.hostPlatform.isLinux (makeDesktopItem {
|
||||
name = "ivette";
|
||||
exec = "ivette";
|
||||
icon = "ivette";
|
||||
desktopName = "Ivette";
|
||||
genericName = "Frama-C's GUI";
|
||||
comment = finalAttrs.meta.description;
|
||||
categories = [ "Development" ];
|
||||
startupWMClass = "Ivette";
|
||||
});
|
||||
|
||||
meta = {
|
||||
description = "Graphical User Interface for Frama-C";
|
||||
longDescription = ''
|
||||
Ivette is the Graphical User Interface (GUI) of Frama-C. It
|
||||
enables exploring code, augmented with several navigation tools
|
||||
and highlighting modes; it allows launching, parametrizing and
|
||||
visualizing analyses; and it allows combining them seamlessly,
|
||||
taking full advantage of the multi-paradigm approach.
|
||||
'';
|
||||
homepage = "https://www.frama-c.com/html/ivette.html";
|
||||
license = lib.licenses.lgpl21;
|
||||
maintainers = with lib.maintainers; [
|
||||
luc65r
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "ivette";
|
||||
};
|
||||
})
|
||||
|
|
@ -216,6 +216,8 @@ buildPythonApplication rec {
|
|||
|
||||
# skip failing tests due to darwin sandbox
|
||||
preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace kitty_tests/check_build.py \
|
||||
--replace test_macos_dictation_forwarding no_test_macos_dictation_forwarding
|
||||
|
||||
substituteInPlace kitty_tests/file_transmission.py \
|
||||
--replace test_transfer_send dont_test_transfer_send
|
||||
|
|
|
|||
|
|
@ -123,6 +123,18 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
substituteInPlace plugins/impex/jp2/jp2_converter.cc \
|
||||
--replace '<openjpeg.h>' '<${openjpeg.incDir}/openjpeg.h>'
|
||||
''
|
||||
# https://invent.kde.org/graphics/krita/-/commit/30182dbfe789c9b44e5762978bf9ebb22c4f72b6
|
||||
+ ''
|
||||
patch -p1 <<EOF
|
||||
--- a/cmake/modules/SIPMacros.cmake
|
||||
+++ b/cmake/modules/SIPMacros.cmake
|
||||
@@ -152,3 +152,3 @@
|
||||
if (QT_MAJOR_VERSION STREQUAL "6")
|
||||
- set(abi_version "13.0")
|
||||
+ set(abi_version "13.8")
|
||||
set(sip_disabled_features "[\"Krita_Qt5\"]")
|
||||
EOF
|
||||
'';
|
||||
|
||||
cmakeBuildType = "RelWithDebInfo";
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ buildGoModule (finalAttrs: {
|
|||
gnutls
|
||||
];
|
||||
|
||||
CGO_LDFLAGS = [
|
||||
env.CGO_LDFLAGS = toString [
|
||||
"-lm"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -22,16 +22,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mise";
|
||||
version = "2026.5.6";
|
||||
version = "2026.5.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jdx";
|
||||
repo = "mise";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ac7pK9LYwm//y4TVa1XtlIxJGkloItJxUcGOVCAxzPk=";
|
||||
hash = "sha256-X4Q7bwRroP8+2GLBfHFy8ru6y2UwBw3CaH43mym0O74=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ZvICWDUpemtsbz9rDqxlNWpRRzEfZEdefJsbXwL4A0E=";
|
||||
cargoHash = "sha256-WFNy0/lP2wEuMRt21HpJZUMDJd6dPNKDY7Pqjx6AXxU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ let
|
|||
in
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "mistral-vibe";
|
||||
version = "2.10.0";
|
||||
version = "2.10.1";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
|
@ -45,7 +45,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
|||
owner = "mistralai";
|
||||
repo = "mistral-vibe";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Xf79PFhBguJQlLcdNhh3oSQ4w5EHrXZomnniiM99WZ4=";
|
||||
hash = "sha256-hbsOA+8tOoFuwiz2KLdcJsbrn/sYec8vqzvh6mKgX08=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -9,17 +9,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mountpoint-s3";
|
||||
version = "1.17.0";
|
||||
version = "1.22.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "mountpoint-s3";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-uV0umUoJkYgmjWjv8GMnk5TRRbCCJS1ut3VV1HvkaAw=";
|
||||
hash = "sha256-22tx8ozXkzBNAflDPc7cdfUh9TWD6aB/Fe/z/dPZ694=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zDgAGOuK0Jkmm554qZsaA/ABFhuupJ+WToO8HSPp7Xc=";
|
||||
cargoHash = "sha256-SSSXqgJ3OERCVw81iXqXRRpVXgdwhlefHhI/qvQyl4g=";
|
||||
|
||||
# thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9:
|
||||
# cargo metadata failure: error: none of the selected packages contains these features: libfuse3
|
||||
|
|
@ -32,6 +32,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
];
|
||||
buildInputs = [ fuse3 ];
|
||||
|
||||
# The S3CrtClient doctest in mountpoint-s3-client constructs a real client,
|
||||
# which requires a TLS trust store unavailable in the sandbox.
|
||||
cargoTestFlags = [
|
||||
"--workspace"
|
||||
"--lib"
|
||||
"--bins"
|
||||
"--tests"
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
#thread 's3_crt_client::tests::test_expected_bucket_owner' panicked at mountpoint-s3-client/src/s3_crt_client.rs:1123:47:
|
||||
#Create test client: ProviderFailure(Error(1173, "aws-c-io: AWS_IO_TLS_ERROR_DEFAULT_TRUST_STORE_NOT_FOUND, Default TLS trust store not found on this system. Trusted CA certificates must be installed, or \"override default trust store\" must be used while creating the TLS context."))
|
||||
|
|
@ -44,9 +53,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
"--skip=s3_crt_client::tests::test_expected_bucket_owner"
|
||||
"--skip=s3_crt_client::tests::test_user_agent_with_prefix"
|
||||
"--skip=s3_crt_client::tests::test_user_agent_without_prefix"
|
||||
"--skip=test_lookup_throttled_mock::both_list_and_head"
|
||||
"--skip=test_lookup_throttled_mock::head_object"
|
||||
"--skip=test_lookup_throttled_mock::list_object"
|
||||
"--skip=test_lookup_unhandled_error_mock"
|
||||
"--skip=test_read_unhandled_error_mock"
|
||||
"--skip=tests::smoke"
|
||||
# fuse module not available on build machine ?
|
||||
#
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mumps";
|
||||
version = "5.8.2";
|
||||
version = "5.9.0";
|
||||
# makeFlags contain space and one should use makeFlagsArray+
|
||||
# Setting this magic var is an optional solution
|
||||
__structuredAttrs = true;
|
||||
|
|
@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
src = fetchzip {
|
||||
url = "https://mumps-solver.org/MUMPS_${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-AzCzNUd+NFP7Jat4cw1YpA9160cvW1zXLoLxstsbtHA=";
|
||||
hash = "sha256-6dytNY5IbuPcOOnCPdE08hNPS09eNrJeoNdJXhLnB5I=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
|
|
|
|||
|
|
@ -61,6 +61,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
url = "${patchSource}/include_stdlib.patch";
|
||||
hash = "sha256-W+NgGBuy/UmzVbPTSqR8FRUlyN/9dl9l9e9rxKklmIc=";
|
||||
})
|
||||
# Fix build with pybind11 3.x.
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/NGSolve/netgen/commit/ceacae3844ed2f0c48c8b6a3a82904b16c594f41.patch?full_index=1";
|
||||
hash = "sha256-uSlkKxuOoUt4n601vadEZogSF47zdWNOIk1Nr9Ra3AU=";
|
||||
})
|
||||
./ensure_python_before_getting_gil.patch
|
||||
./macos_use_tk_default_color_map.patch
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchPypi,
|
||||
python3,
|
||||
installShellFiles,
|
||||
nix-update-script,
|
||||
|
|
@ -13,11 +14,15 @@ let
|
|||
packageOverrides = self: super: {
|
||||
jmespath = super.jmespath.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.10.0";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9";
|
||||
hash = "";
|
||||
};
|
||||
src =
|
||||
fetchPypi {
|
||||
pname = "jmespath";
|
||||
inherit version;
|
||||
sha256 = "b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9";
|
||||
}
|
||||
// {
|
||||
tag = version;
|
||||
};
|
||||
doCheck = false;
|
||||
});
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
libsoup_3,
|
||||
dbus,
|
||||
|
|
@ -7,27 +8,56 @@
|
|||
librsvg,
|
||||
webkitgtk_4_1,
|
||||
pkg-config,
|
||||
cargo-tauri,
|
||||
wrapGAppsHook3,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
rustPlatform,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
makeBinaryWrapper,
|
||||
mono,
|
||||
jq,
|
||||
wrapWithMono ? true,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
let
|
||||
pname = "owmods-gui";
|
||||
version = "0.15.4";
|
||||
|
||||
version = "0.15.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ow-mods";
|
||||
repo = "ow-mod-man";
|
||||
tag = "gui_v${finalAttrs.version}";
|
||||
hash = "sha256-1m648o9hm7j/etNNhGy2Yq9paz6ZHWDxVBLGdzGMbZQ=";
|
||||
tag = "gui_v${version}";
|
||||
hash = "sha256-2jf9yjvWvE6If2ChdbgdLwSJtyj4AYSKkV9E7jgQ3G8=";
|
||||
};
|
||||
frontend = buildNpmPackage {
|
||||
pname = "owmods-gui-ui";
|
||||
inherit version;
|
||||
|
||||
cargoHash = "sha256-/id7DC3W22musOI4r4b0RPqSnIQVn1yHYLZcTilShVk=";
|
||||
env.VITE_VERSION_SUFFIX = "-nix";
|
||||
|
||||
src = "${src}/owmods_gui/frontend";
|
||||
|
||||
packageJSON = "${src}/owmods_gui/frontend/package.json";
|
||||
npmDepsHash = "sha256-Ske3EFiLDPMLI2ln65pZL22pExT/OfT0v0x+TxiZjQo=";
|
||||
|
||||
postBuild = ''
|
||||
cp -r ../dist/ $out
|
||||
'';
|
||||
distPhase = "true";
|
||||
dontInstall = true;
|
||||
installInPlace = true;
|
||||
distDir = "../dist";
|
||||
|
||||
meta = {
|
||||
description = "Web frontend for the Outer Wilds Mod Manager";
|
||||
homepage = "https://github.com/ow-mods/ow-mod-man/tree/main/owmods_gui/frontend";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
};
|
||||
};
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version src;
|
||||
|
||||
cargoHash = "sha256-UsqkamsWyJ+SUOD8Ab0wZIfcL6NBe0kKbLXSm7rFOGM=";
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [
|
||||
|
|
@ -35,12 +65,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo-tauri.hook
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
pkg-config
|
||||
copyDesktopItems
|
||||
wrapGAppsHook3
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
makeBinaryWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
dbus
|
||||
libsoup_3
|
||||
glib
|
||||
|
|
@ -51,68 +86,41 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
buildAndTestSubdir = "owmods_gui/backend";
|
||||
|
||||
preFixup = lib.optionalString wrapWithMono "gappsWrapperArgs+=(--prefix PATH : '${mono}/bin')";
|
||||
preFixup = lib.optionalString (
|
||||
stdenv.hostPlatform.isLinux && wrapWithMono
|
||||
) "gappsWrapperArgs+=(--prefix PATH : '${mono}/bin')";
|
||||
|
||||
postPatch =
|
||||
let
|
||||
frontend = buildNpmPackage {
|
||||
inherit (finalAttrs) version;
|
||||
|
||||
env.VITE_VERSION_SUFFIX = "-nix";
|
||||
|
||||
pname = "owmods-gui-ui";
|
||||
src = "${finalAttrs.src}/owmods_gui/frontend";
|
||||
|
||||
packageJSON = "${finalAttrs.src}/owmods_gui/frontend/package.json";
|
||||
npmDepsHash = "sha256-PDpL8Cdl6U17wPBGmyg5kYP5zh1NXRPVnaW4WrFD3oM=";
|
||||
|
||||
postBuild = ''
|
||||
cp -r ../dist/ $out
|
||||
'';
|
||||
distPhase = "true";
|
||||
dontInstall = true;
|
||||
installInPlace = true;
|
||||
distDir = "../dist";
|
||||
|
||||
meta = {
|
||||
description = "Web frontend for the Outer Wilds Mod Manager";
|
||||
homepage = "https://github.com/ow-mods/ow-mod-man/tree/main/owmods_gui/frontend";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
};
|
||||
};
|
||||
in
|
||||
''
|
||||
substituteInPlace owmods_gui/backend/tauri.conf.json \
|
||||
--replace-fail '"frontendDist": "../dist"' '"frontendDist": "${frontend}"'
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -DT owmods_gui/backend/icons/128x128@2x.png $out/share/icons/hicolor/256x256@2/apps/outer-wilds-mod-manager.png
|
||||
install -DT owmods_gui/backend/icons/128x128.png $out/share/icons/hicolor/128x128/apps/outer-wilds-mod-manager.png
|
||||
install -DT owmods_gui/backend/icons/32x32.png $out/share/icons/hicolor/32x32/apps/outer-wilds-mod-manager.png
|
||||
|
||||
mv $out/bin/owmods_gui $out/bin/outer-wilds-mod-manager
|
||||
postPatch = ''
|
||||
${lib.getExe jq} \
|
||||
'del(.plugins.tauri.updater) | .build.frontendDist = "${frontend}" | del(.build.beforeBuildCommand) | .bundle.createUpdaterArtifacts = false' owmods_gui/backend/tauri.conf.json > owmods_gui/backend/new.tauri.conf.json;
|
||||
mv owmods_gui/backend/new.tauri.conf.json owmods_gui/backend/tauri.conf.json
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "outer-wilds-mod-manager";
|
||||
exec = "outer-wilds-mod-manager %u";
|
||||
icon = "outer-wilds-mod-manager";
|
||||
desktopName = "Outer Wilds Mod Manager";
|
||||
categories = [ "Game" ];
|
||||
comment = "Manage Outer Wilds Mods";
|
||||
mimeTypes = [ "x-scheme-handler/owmods" ];
|
||||
})
|
||||
];
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p "$out/bin"
|
||||
makeWrapper "$out/Applications/Outer Wilds Mod Manager.app/Contents/MacOS/owmods_gui" "$out/bin/owmods_gui" ${lib.optionalString wrapWithMono "--set MONO_BINARY ${lib.getExe mono}"}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit frontend;
|
||||
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--subpackage"
|
||||
"frontend"
|
||||
"--version-regex"
|
||||
"gui_v(.*)"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "GUI version of the mod manager for Outer Wilds Mod Loader";
|
||||
homepage = "https://github.com/ow-mods/ow-mod-man/tree/main/owmods_gui";
|
||||
downloadPage = "https://github.com/ow-mods/ow-mod-man/releases/tag/gui_v${finalAttrs.version}";
|
||||
changelog = "https://github.com/ow-mods/ow-mod-man/releases/tag/gui_v${finalAttrs.version}";
|
||||
mainProgram = "outer-wilds-mod-manager";
|
||||
platforms = lib.platforms.linux;
|
||||
downloadPage = "https://github.com/ow-mods/ow-mod-man/releases/tag/gui_v${version}";
|
||||
changelog = "https://github.com/ow-mods/ow-mod-man/releases/tag/gui_v${version}";
|
||||
mainProgram = "owmods_gui";
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
bwc9876
|
||||
|
|
@ -120,4 +128,4 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
spoonbaker
|
||||
];
|
||||
};
|
||||
})
|
||||
}
|
||||
|
|
|
|||
41
pkgs/by-name/pl/plasmavantage/package.nix
Normal file
41
pkgs/by-name/pl/plasmavantage/package.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitLab,
|
||||
nix-update-script,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "plasmavantage";
|
||||
version = "0.30";
|
||||
src = fetchFromGitLab {
|
||||
owner = "Scias";
|
||||
repo = "plasmavantage";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-++WewCzTWGrMTXhBQQ339W/bDgKO040xeBNhozljsko=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/plasma/plasmoids
|
||||
cp -r $src/package $out/share/plasma/plasmoids/com.gitlab.scias.plasmavantage
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Plasmoid for controlling certain features of Lenovo laptops";
|
||||
homepage = "https://gitlab.com/Scias/plasmavantage";
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = with lib.maintainers; [ ccicnce113424 ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
@ -5,10 +5,10 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "psftools";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
src = fetchurl {
|
||||
url = "https://www.seasip.info/Unix/PSF/psftools-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-d/XlKPqYy9x8KNT+8G6zv9ST/uU53Tg4pYrlA17Jh94=";
|
||||
sha256 = "sha256-uiPWgJblAMKpM79L1FrJg4RzJ0D/XenkfUXNTmvq9B8=";
|
||||
};
|
||||
outputs = [
|
||||
"out"
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
}:
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "pyhanko-cli";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MatthiasValvekens";
|
||||
repo = "pyhanko";
|
||||
tag = "pyhanko-cli/v${finalAttrs.version}";
|
||||
hash = "sha256-ZBlkp6nhTKEAWxCPDq9NIoOullwWartpU3eL0QIGFpw=";
|
||||
hash = "sha256-huOy04wY7xP1gZ5azsZYnMXLZ4MwMkLGujlgXTtjLy4=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/pkgs/pyhanko-cli";
|
||||
|
|
@ -46,6 +46,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
|||
]
|
||||
++ (with python3Packages; [
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
pyhanko.testData
|
||||
requests-mock
|
||||
freezegun
|
||||
|
|
|
|||
34
pkgs/by-name/ra/rad-key/package.nix
Normal file
34
pkgs/by-name/ra/rad-key/package.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromRadicle,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rad-key";
|
||||
version = "0.1.1";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromRadicle {
|
||||
seed = "radicle.defelo.de";
|
||||
repo = "zFF3JpT1VrrsDYogDPtVZMHw6P4x";
|
||||
tag = "releases/${finalAttrs.version}";
|
||||
hash = "sha256-0lPVkgBHfIG4fF/JuEnRznnHR9VaX91UBjmHqoFj2rk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-W/4h+hvsmydZim4HrylLWADINRcwP8cOgoBtPbuSxKY=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
description = "Convert between Radicle identities and public SSH keys";
|
||||
homepage = "https://radicle.defelo.de/nodes/radicle.defelo.de/rad:zFF3JpT1VrrsDYogDPtVZMHw6P4x";
|
||||
license = lib.licenses.mit;
|
||||
teams = [ lib.teams.radicle ];
|
||||
mainProgram = "rad-key";
|
||||
};
|
||||
})
|
||||
5
pkgs/by-name/ra/rad-key/update.sh
Executable file
5
pkgs/by-name/ra/rad-key/update.sh
Executable file
|
|
@ -0,0 +1,5 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p coreutils gnugrep common-updater-scripts nix-update
|
||||
|
||||
version=$(list-git-tags | grep -oP '^releases/\K\d+\.\d+\.\d+$' | sort -rV | head -1)
|
||||
nix-update --version="$version" rad-key
|
||||
|
|
@ -21,6 +21,7 @@
|
|||
wrapGAppsHook4,
|
||||
rustfmt,
|
||||
clippy,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
|
@ -97,12 +98,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
radicle-node
|
||||
rustfmt
|
||||
clippy
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
export RAD_HOME="$PWD/_rad-home"
|
||||
export RAD_PASSPHRASE=""
|
||||
rad auth --alias test
|
||||
bins="tests/tmp/bin/heartwood/$HW_RELEASE"
|
||||
|
|
|
|||
|
|
@ -15,9 +15,9 @@
|
|||
xdg-utils,
|
||||
versionCheckHook,
|
||||
|
||||
version ? "1.8.0",
|
||||
srcHash ? "sha256-QjAdZO5PwJ6FuThzQYnkF+hAeArltXxhEnzIcAePwzA=",
|
||||
cargoHash ? "sha256-m8CqRTJD/1bOqTB2SoUjglZsOWGfv/nBNTOQftNvIqE=",
|
||||
version ? "1.9.0",
|
||||
srcHash ? "sha256-ECged52tJaBSW2ua3MPDEBdGKPJ50Q347evd5wdbbU0=",
|
||||
cargoHash ? "sha256-Vb86Zx851Mrn9yaNuIQHEuVr7PrD7plPZhPGFJOLKRg=",
|
||||
updateScript ? ./update.sh,
|
||||
}:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ radicle-node }:
|
||||
|
||||
radicle-node.override {
|
||||
version = "1.9.0-rc.3";
|
||||
srcHash = "sha256-NUxrNv0NbqZqE0zx8L+PS32jFeb/upoGtZorEcL4O1c=";
|
||||
cargoHash = "sha256-WUOfZ41ImJQhX5Jqj6z8v28oapG/sP4zBe8inkfDlbA=";
|
||||
version = "1.9.0";
|
||||
srcHash = "sha256-ECged52tJaBSW2ua3MPDEBdGKPJ50Q347evd5wdbbU0=";
|
||||
cargoHash = "sha256-Vb86Zx851Mrn9yaNuIQHEuVr7PrD7plPZhPGFJOLKRg=";
|
||||
updateScript = ./update-unstable.sh;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "snmpen";
|
||||
version = "1.1.0";
|
||||
version = "1.1.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fabaff";
|
||||
repo = "snmpen";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-PH1kUnDOiiE7ouEkhd1+TuIBziB2uxCVnmiEkCgQma0=";
|
||||
hash = "sha256-XJP+f5Ahizxgk80B0896sbE6JeNB0Bm7aafwJsFaHYY=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [ hatchling ];
|
||||
|
|
@ -38,8 +38,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
|||
|
||||
meta = {
|
||||
description = "SNMP Enumeration tool";
|
||||
homepage = "https://github.com/fabaff/snmpen";
|
||||
changelog = "https://github.com/fabaff/snmpen/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
homepage = "https://github.com/affolter-engineering/snmpen";
|
||||
changelog = "https://github.com/affolter-engineering/snmpen/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "snmpen";
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
bzip2,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
ncurses,
|
||||
python3,
|
||||
readline,
|
||||
|
|
@ -20,6 +21,15 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
hash = "sha256-BlZjfZKtCm1kWNPjdth3pYFN0plU7xfTsFotPefzzMY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Add missing <cstdint> for uint{8,64}_t to fix build with gcc 15.
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/ablab/spades/commit/10b6af96ead72fdb19e8e524aa24bdcff9986e76.patch?full_index=1";
|
||||
relative = "src";
|
||||
hash = "sha256-yAQVqE6DwPe+GZ4VR1cGytaO8NmHz6TUG7EdtbxIuTU=";
|
||||
})
|
||||
];
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -6,26 +6,23 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "sploitscan";
|
||||
version = "0.12.0";
|
||||
version = "0.14.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xaitax";
|
||||
repo = "SploitScan";
|
||||
tag = "v.${finalAttrs.version}";
|
||||
hash = "sha256-5aSEHZKTmkO/KcklMUEt2q8hqPc8XiT5QUU1YY3wmBw=";
|
||||
hash = "sha256-TVxwgYUyFF+W1rMzGffii/vBo3GXCNO5SxuVcYyUgxA=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"openai"
|
||||
"requests"
|
||||
];
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
setuptools
|
||||
];
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
gitpython
|
||||
google-genai
|
||||
jinja2
|
||||
openai
|
||||
requests
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "sqlfluff";
|
||||
version = "4.1.0";
|
||||
version = "4.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sqlfluff";
|
||||
repo = "sqlfluff";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ABadTClJDc5MXweZbc6Y4GqEq/Xgd6t+FhT6aGw1eZo=";
|
||||
hash = "sha256-SBLctAy5Ut5gnCSL2Kn/CMGgI/SCyX3g4WoLXgyy4Wg=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "click" ];
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
diff --git a/src/external/pac_responder.m4 b/src/external/pac_responder.m4
|
||||
index 9072718..3501b6b 100644
|
||||
--- a/src/external/pac_responder.m4
|
||||
+++ b/src/external/pac_responder.m4
|
||||
@@ -23,7 +23,8 @@ then
|
||||
Kerberos\ 5\ release\ 1.18* | \
|
||||
Kerberos\ 5\ release\ 1.19* | \
|
||||
Kerberos\ 5\ release\ 1.20* | \
|
||||
- Kerberos\ 5\ release\ 1.21*)
|
||||
+ Kerberos\ 5\ release\ 1.21* | \
|
||||
+ Kerberos\ 5\ release\ 1.22*)
|
||||
krb5_version_ok=yes
|
||||
AC_MSG_RESULT([yes])
|
||||
;;
|
||||
|
|
@ -65,13 +65,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sssd";
|
||||
version = "2.12.0";
|
||||
version = "2.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SSSD";
|
||||
repo = "sssd";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-9F+D7qZKwnP1U0zJbvzy0f7dQSKkfgJrewDJ4p+Svgk=";
|
||||
hash = "sha256-/zMF7+rpQpWNq7srK2/gP99tgq8s6uFAYb/ORoPO/9w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
35
pkgs/by-name/st/stepcode/package.nix
Normal file
35
pkgs/by-name/st/stepcode/package.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "stepcode";
|
||||
version = "0.8.2-unstable-2026-02-09";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stepcode";
|
||||
repo = "stepcode";
|
||||
rev = "74b6fe45751bd60be749bc80766f38745d29ed72";
|
||||
hash = "sha256-RDYHRvotBd6xBuo6eZ6ZB8RHJz5suQ5Rx8LeZlbbBGQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Library for reading and writing STEP Part 21 exchange files";
|
||||
homepage = "https://github.com/stepcode/stepcode";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [
|
||||
wishstudio
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -7,16 +7,15 @@
|
|||
|
||||
# nativeBuildInputs
|
||||
cmake,
|
||||
|
||||
# propagatedBuildInputs
|
||||
nlohmann_json,
|
||||
stb,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tinygltf";
|
||||
version = "3.0.0";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "syoyo";
|
||||
repo = "tinygltf";
|
||||
|
|
@ -28,13 +27,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
cmake
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
nlohmann_json
|
||||
stb
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "TINYGLTF_INSTALL_VENDOR" false)
|
||||
# unvendoring will break downstream applications
|
||||
# unless at least patch the CMake modules
|
||||
(lib.cmakeBool "TINYGLTF_INSTALL_VENDOR" true)
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
|
|
|||
|
|
@ -18,17 +18,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "uv";
|
||||
version = "0.11.14";
|
||||
version = "0.11.15";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "uv";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-CcR7lT9Gwx6AyCQDgtf0mjcFMvisLcZZttY4bA1QBz0=";
|
||||
hash = "sha256-Nwf7DSxXG5F515LW19q+2VpXtdVLUWx2sMQr35lvsgk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-f+CTTbMnSmOEGqc93bcQJ2xsxk7GQq1xnIybg+/fM1s=";
|
||||
cargoHash = "sha256-PWkDAl6jkpZBz19mz4ZQmiA/RvgFC0KOftXQtZ0SFdk=";
|
||||
|
||||
buildInputs = [
|
||||
rust-jemalloc-sys
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "vuls";
|
||||
version = "0.39.0";
|
||||
version = "0.39.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "future-architect";
|
||||
repo = "vuls";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-pK8bW/1Bq8MCGBRBWt4u6DMFjUitWFbJNr9ekP54X6s=";
|
||||
hash = "sha256-SaQLxWhRgA/RDvfLp4r8r98CQEog5Uwh7WjnQC+Fj+k=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -58,11 +58,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "webex";
|
||||
version = "46.4.0.34620";
|
||||
version = "46.4.0.34752";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://binaries.webex.com/WebexDesktop-Ubuntu-2004-Gold/20260408162435/Webex_ubuntu.7z";
|
||||
sha256 = "f23e8d23230ff33412d01df44a8c49075721e94f10507334c0806625a94114da";
|
||||
url = "https://binaries.webex.com/WebexDesktop-Ubuntu-2004-Gold/20260422175501/Webex_ubuntu.7z";
|
||||
sha256 = "8b0711259237ae1009c05b012d44c5fc4e222005bf26d9ac1b84af063719d09a";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,34 +3,55 @@
|
|||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
git,
|
||||
openssl,
|
||||
docker,
|
||||
versionCheckHook,
|
||||
writableTmpDirAsHomeHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wrkflw";
|
||||
version = "0.7.3";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bahdotsh";
|
||||
repo = "wrkflw";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-VwB8qpCNyuB28XqIUJa+ghtZ4Dx1QYDluw6+zxtePIQ=";
|
||||
hash = "sha256-2k2U90Sqe0AOmOMDfy9CPwlHx6pACZ4dKNO7P5IdRvo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-lZ2dcR33fzIUX8XvJMcysQWSViWD1hpm471wkpD22QA=";
|
||||
cargoHash = "sha256-fp+JFrIcnWXA9SyyVrjX/0nJdLnbySAN0c1VrTeRmMA=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
git
|
||||
];
|
||||
buildInputs = [
|
||||
openssl
|
||||
docker
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
# Prepare the necessary environment for the tests
|
||||
preCheck = ''
|
||||
git init -b main
|
||||
git add .
|
||||
git -c user.name="John Smith" -c user.email=john.smith@example.com commit -m "initial commit"
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
__darwinAllowLocalNetworking = true;
|
||||
sandboxProfile = ''
|
||||
(allow mach-lookup
|
||||
(global-name "com.apple.SystemConfiguration.configd")
|
||||
(global-name "com.apple.FSEvents"))
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
|
||||
|
||||
meta = {
|
||||
description = "Validate and execute GitHub Actions workflows locally";
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "xk6";
|
||||
version = "1.3.7";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "xk6";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-/7u06n0bpRfPIeAs6t8UM9gw2ZYbNcyFGRZ56Z6JVQY=";
|
||||
hash = "sha256-dQiv+weenG3o7eUHtfUzGFPYAXCspyRSPclQjhje7+U=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zizmor";
|
||||
version = "1.25.0";
|
||||
version = "1.25.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zizmorcore";
|
||||
repo = "zizmor";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zstTa03aakVWCWGkMQZesz1b6p7S+XWgnJTf/DrWHVI=";
|
||||
hash = "sha256-nmhmW+e/Mys/PVGA0V2NalFDQ/qkcvT0F80XrmIZYb4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-eNgq6B7aI90/hfBqieDbO7zV53PugyAUADxpqH4t4ek=";
|
||||
cargoHash = "sha256-3ALVZJNpk0HiwmDGQigoSXuOdJR94nEKOWWiP5aggxo=";
|
||||
|
||||
buildInputs = [
|
||||
rust-jemalloc-sys
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "frama-c-lannotate";
|
||||
version = "0.2.4";
|
||||
version = "0.2.5";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://git.frama-c.com/pub/ltest/lannotate/-/archive/${finalAttrs.version}/lannotate-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-JoD2M3R3/DcUMt33QOvwqHg4eToCgjB8riKc09TWdyc=";
|
||||
hash = "sha256-S7/So+1HBdkeq4k7BisEe2gpzW4vHFi6x8J8evaPgRw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
buildDunePackage,
|
||||
dune-site,
|
||||
fetchzip,
|
||||
fetchFromGitLab,
|
||||
frama-c,
|
||||
menhir,
|
||||
unionFind,
|
||||
|
|
@ -11,11 +11,15 @@
|
|||
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "frama-c-luncov";
|
||||
version = "0.2.4";
|
||||
version = "0.2.4-unstable-2025-11-24";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://git.frama-c.com/pub/ltest/luncov/-/archive/${finalAttrs.version}/luncov-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-E7zzm9qs34V+sRHElpe1JKHjeyXGALXVj1DNMVzlWn0=";
|
||||
src = fetchFromGitLab {
|
||||
group = "pub";
|
||||
owner = "ltest";
|
||||
repo = "luncov";
|
||||
domain = "git.frama-c.com";
|
||||
rev = "76b14a41ae9e5eacb90649cb1401a75e37a61d52"; # latest commit from stable/germanium branch
|
||||
hash = "sha256-dp693isevR4N4V/3FZ1lnbw0xjR+CuAK8BD/Bwvny0E";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,20 +3,22 @@
|
|||
pkgs,
|
||||
ocaml,
|
||||
findlib,
|
||||
framac,
|
||||
frama-c,
|
||||
camlzip,
|
||||
dune-site,
|
||||
ocamlgraph,
|
||||
menhirLib,
|
||||
ppx_deriving,
|
||||
ppx_inline_test,
|
||||
yaml,
|
||||
yojson,
|
||||
zarith,
|
||||
zmq,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ocaml${ocaml.version}-frama-c";
|
||||
inherit (framac) version meta;
|
||||
inherit (frama-c) version meta;
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
|
|
@ -28,15 +30,17 @@ stdenv.mkDerivation {
|
|||
menhirLib
|
||||
ocamlgraph
|
||||
ppx_deriving
|
||||
ppx_inline_test
|
||||
yaml
|
||||
yojson
|
||||
zarith
|
||||
zmq
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $OCAMLFIND_DESTDIR
|
||||
for p in ${framac}/lib/*
|
||||
for p in ${frama-c}/lib/*
|
||||
do
|
||||
ln -s $p $OCAMLFIND_DESTDIR/
|
||||
done
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioimmich";
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mib1185";
|
||||
repo = "aioimmich";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-p04FGEQXUGMGouy6bY0QW8rC7Ld5RaSoOV/UbAkmNwQ=";
|
||||
hash = "sha256-wKB2WtC5zMEnT2wF9Ed0yW2w9c1p642SXJmy5jJrQQc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
let
|
||||
pname = "ansible";
|
||||
version = "13.5.0";
|
||||
version = "13.6.0";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
|
|
@ -32,7 +32,7 @@ buildPythonPackage {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-abF15pTZUR/sg4sKgvFQurNm3Zy3qCkJbD06cvYEZxk=";
|
||||
hash = "sha256-UUFVLBvTf1aDnrWxHvDZPpI5EpXJeUfVB7ja9yZbErg=";
|
||||
};
|
||||
|
||||
# we make ansible-core depend on ansible, not the other way around,
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "array-api-strict";
|
||||
version = "2.4.1";
|
||||
version = "2.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "data-apis";
|
||||
repo = "array-api-strict";
|
||||
tag = version;
|
||||
hash = "sha256-m0uWaeUwHsWyAOxS7nxY8c+HWUhz+mOKNE4M0DsiClI=";
|
||||
hash = "sha256-jDigE1bCx2JbthIPuVd3dX1tdvGqcZVOR3opJwlTme4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -358,13 +358,13 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.43.10";
|
||||
version = "1.43.11";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-BVdWWLgn56EqRWKeGphzF+HmedzKvl695aIQFSjHbPg=";
|
||||
hash = "sha256-PZ9xPo1eVRFtQCSYCHvRubj8m11abbrcp7uJus0ki0E=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "iamdata";
|
||||
version = "0.1.202605191";
|
||||
version = "0.1.202605201";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-copilot";
|
||||
repo = "iam-data-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2JrnSAj3v21bfu5Ytp+zOLx93nilPEnxiem3f3PpMGA=";
|
||||
hash = "sha256-nUFxppxpk8T5QIWAF6eJL3Y6UE+p3QwBbZEtZWVt+wE=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
|
|
|||
|
|
@ -24,14 +24,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain-fireworks";
|
||||
version = "1.2.0";
|
||||
version = "1.3.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langchain";
|
||||
tag = "langchain-fireworks==${version}";
|
||||
hash = "sha256-8qjF9QYtNneCijGYK8m40NZQIWxCeCLSN6S5jeWfyQE=";
|
||||
hash = "sha256-ladhHikzzLOf8mz98c+vawoSCTKBAx2XcQPtzMePr2A=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/partners/fireworks";
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "manifestoo-core";
|
||||
version = "1.15.1";
|
||||
version = "1.15.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "manifestoo_core";
|
||||
hash = "sha256-QvdquUEwaHIX94m0/FVJ41/mmmQZz9Nj3F9ZepWgIFM=";
|
||||
hash = "sha256-cneTeLVamKknBPSZSnd+6ks2D7W2HDv6PLqCeMZJ4Gg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ hatch-vcs ];
|
||||
|
|
|
|||
|
|
@ -574,8 +574,8 @@ in
|
|||
buildMypyBoto3Package "glue" "1.43.8"
|
||||
"sha256-CJJviequ3qlGqjvK0p4Z1/MPG0XK6k7LM0CkOfh4LCc=";
|
||||
mypy-boto3-grafana =
|
||||
buildMypyBoto3Package "grafana" "1.43.8"
|
||||
"sha256-qjSN2N+pZSw4PXSziognGUE4U7W+4BIr/qcmcu6+M9o=";
|
||||
buildMypyBoto3Package "grafana" "1.43.11"
|
||||
"sha256-XJOSLyL1+uEweZ9zER7IhH3DFLaLtpJKvuRIn8Ri+P4=";
|
||||
|
||||
mypy-boto3-greengrass =
|
||||
buildMypyBoto3Package "greengrass" "1.43.0"
|
||||
|
|
@ -590,8 +590,8 @@ in
|
|||
"sha256-nTKK7qqa2apyNM4/U2AphLGvoSqemVKfpAciilJ0pRE=";
|
||||
|
||||
mypy-boto3-guardduty =
|
||||
buildMypyBoto3Package "guardduty" "1.43.6"
|
||||
"sha256-G0b+n8/YssnJeC5vdQSf2wNYlYNXhZYWnNzDw6wjgc8=";
|
||||
buildMypyBoto3Package "guardduty" "1.43.11"
|
||||
"sha256-P8QXa4Fcbyeh9mnFh+4OEby6aleplsSpotZzDCo/Pwc=";
|
||||
|
||||
mypy-boto3-health =
|
||||
buildMypyBoto3Package "health" "1.43.0"
|
||||
|
|
@ -1170,8 +1170,8 @@ in
|
|||
"sha256-T+JIJpHxD7IzAwq8yxgq6zbVMj/btpbhKnylMyfFvvU=";
|
||||
|
||||
mypy-boto3-sagemaker =
|
||||
buildMypyBoto3Package "sagemaker" "1.43.7"
|
||||
"sha256-32sFjHHqE0IU9DouhrWPMG3RKpOYZ5Z2af+hD0vJkyg=";
|
||||
buildMypyBoto3Package "sagemaker" "1.43.11"
|
||||
"sha256-fajK9mOIDbfYcEftRqZDbktC1nOLa9xWIEnOzUwiLYA=";
|
||||
|
||||
mypy-boto3-sagemaker-a2i-runtime =
|
||||
buildMypyBoto3Package "sagemaker-a2i-runtime" "1.43.0"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mysql-connector";
|
||||
version = "9.6.0";
|
||||
version = "9.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
setupPyBuildFlags = [
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "mysql";
|
||||
repo = "mysql-connector-python";
|
||||
tag = version;
|
||||
hash = "sha256-EwdJpiyplck26Tc9SiczxGieJ3GcTGMQva/fDzhzWn4=";
|
||||
hash = "sha256-D4aAkdIfAcsQumjROA6/+KB6CcjVYcq7yo4FeVUZtX0=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/mysql-connector-python";
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "nomadnet";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "markqvist";
|
||||
repo = "NomadNet";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-uNchcz9kiLX2nUNRC2rTMv7my+19ylZrHTGWbonziFc=";
|
||||
hash = "sha256-2XbEJfB9Qj58u3rdTQA4DY2ZsVk/6FBhvlggBdrwRBk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
76
pkgs/development/python-modules/nvidia-cutlass/default.nix
Normal file
76
pkgs/development/python-modules/nvidia-cutlass/default.nix
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
cuda-bindings,
|
||||
cuda-pathfinder,
|
||||
networkx,
|
||||
numpy,
|
||||
pydot,
|
||||
scipy,
|
||||
treelib,
|
||||
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
torch,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "nvidia-cutlass";
|
||||
version = "4.2.0";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "cutlass";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XicHeV9ni9bSOWcUJM8HrCuz61mVK1EdZ9uxNvgWmvk=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
pythonRemoveDeps = [
|
||||
# Replaced with the cuda-python sub-packages we actually need
|
||||
"cuda-python"
|
||||
];
|
||||
dependencies = [
|
||||
cuda-bindings
|
||||
cuda-pathfinder
|
||||
networkx
|
||||
numpy
|
||||
pydot
|
||||
scipy
|
||||
treelib
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"cutlass_cppgen"
|
||||
"cutlass_library"
|
||||
"pycute"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
torch
|
||||
];
|
||||
|
||||
enabledTestPaths = [
|
||||
"test"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Python bindings for NVIDIA's CUTLASS library";
|
||||
homepage = "https://github.com/NVIDIA/cutlass";
|
||||
changelog = "https://github.com/NVIDIA/cutlass/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
})
|
||||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyhanko-certvalidator";
|
||||
version = "0.29.1";
|
||||
version = "0.31.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MatthiasValvekens";
|
||||
repo = "pyhanko";
|
||||
tag = "pyhanko-certvalidator/v${version}";
|
||||
hash = "sha256-+576MAbtWFGaPu/HqhdeeRNHi84pLnDaMDa0e/J/CUs=";
|
||||
hash = "sha256-mZ9u3mQ8JZIq+G1iwNQST8r7/rCWi/UW0j1xfeV9zFM=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/pkgs/pyhanko-certvalidator";
|
||||
|
|
|
|||
|
|
@ -38,14 +38,14 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pyhanko";
|
||||
version = "0.34.1";
|
||||
version = "0.35.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MatthiasValvekens";
|
||||
repo = "pyHanko";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZBlkp6nhTKEAWxCPDq9NIoOullwWartpU3eL0QIGFpw=";
|
||||
hash = "sha256-mZ9u3mQ8JZIq+G1iwNQST8r7/rCWi/UW0j1xfeV9zFM=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/pkgs/pyhanko";
|
||||
|
|
|
|||
|
|
@ -4,35 +4,35 @@
|
|||
fetchFromGitHub,
|
||||
hatchling,
|
||||
hatch-vcs,
|
||||
attrs,
|
||||
click,
|
||||
click-default-group,
|
||||
cloudpickle,
|
||||
git,
|
||||
msgspec,
|
||||
nbmake,
|
||||
networkx,
|
||||
optree,
|
||||
packaging,
|
||||
pexpect,
|
||||
pluggy,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
rich,
|
||||
sqlalchemy,
|
||||
universal-pathlib,
|
||||
pytestCheckHook,
|
||||
cloudpickle,
|
||||
nbmake,
|
||||
pexpect,
|
||||
pytest-xdist,
|
||||
syrupy,
|
||||
git,
|
||||
universal-pathlib,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytask";
|
||||
version = "0.5.8";
|
||||
version = "0.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytask-dev";
|
||||
repo = "pytask";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-tQUvqqbFUO3cw+dVPfCKiYyhwX31vqUBXr7GrRfPC+A=";
|
||||
hash = "sha256-l7jQAUBb8iW5S8Am2cMCgqYcvtLq8UgEhrCNnSx9N1E=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
@ -41,27 +41,34 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
dependencies = [
|
||||
attrs
|
||||
click
|
||||
click-default-group
|
||||
networkx
|
||||
msgspec
|
||||
optree
|
||||
packaging
|
||||
pluggy
|
||||
rich
|
||||
sqlalchemy
|
||||
universal-pathlib
|
||||
];
|
||||
]
|
||||
++ msgspec.optional-dependencies.toml;
|
||||
|
||||
optional-dependencies = {
|
||||
dag = [ networkx ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
cloudpickle
|
||||
git
|
||||
nbmake
|
||||
pexpect
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
syrupy
|
||||
];
|
||||
]
|
||||
++ lib.concatAttrValues optional-dependencies;
|
||||
|
||||
pytestFlags = [ "--snapshot-warn-unused" ];
|
||||
|
||||
# The test suite runs the installed command for e2e tests
|
||||
preCheck = ''
|
||||
|
|
@ -73,13 +80,13 @@ buildPythonPackage rec {
|
|||
"test_download_file"
|
||||
# Racy
|
||||
"test_more_nested_pytree_and_python_node_as_return_with_names"
|
||||
# Without uv, subprocess unexpectedly doesn't fail
|
||||
"test_pytask_on_a_module_that_uses_the_functional_api"
|
||||
# Timeout
|
||||
"test_pdb_interaction_capturing_twice"
|
||||
"test_pdb_interaction_capturing_simple"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pytask" ];
|
||||
|
||||
meta = {
|
||||
description = "Workflow management system that facilitates reproducible data analyses";
|
||||
homepage = "https://github.com/pytask-dev/pytask";
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "rns";
|
||||
version = "1.2.5";
|
||||
version = "1.2.9";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "markqvist";
|
||||
repo = "Reticulum";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-FEpQiq6pnFGCMEGOikkf8QFRVPhlTf0X40foqCBfGpU=";
|
||||
hash = "sha256-2BkUMeov6T0jWaFb7vnLcYga3PilGpsJsuooxhpx0Ko=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
82
pkgs/development/python-modules/torch-cluster/default.nix
Normal file
82
pkgs/development/python-modules/torch-cluster/default.nix
Normal file
|
|
@ -0,0 +1,82 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
torch,
|
||||
|
||||
# buildInputs
|
||||
pybind11,
|
||||
|
||||
# dependencies
|
||||
scipy,
|
||||
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
|
||||
# passthru
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
|
||||
pname = "torch-cluster";
|
||||
version = "2.6.3-unstable-2026-03-26";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
# Last stable release is from 2023
|
||||
# Development is still active, but nothing was properly tagged on GitHub or Pypi
|
||||
# See: https://github.com/rusty1s/pytorch_cluster/issues/270
|
||||
src = fetchFromGitHub {
|
||||
owner = "rusty1s";
|
||||
repo = "pytorch_cluster";
|
||||
rev = "af7b9f0af6b74be1594eb3d0a1685470cbb21265";
|
||||
hash = "sha256-2SXkk7m+feqk7uDir3Ov31TujyIUrRSEwONaiaq3Vvs=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
torch
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pybind11
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
scipy
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "torch_cluster" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Otherwise python imports torch_cluster from /build/source instead of $out/..., which fails when
|
||||
# trying to load the inexistant .so artifacts.
|
||||
preCheck = ''
|
||||
rm -rf torch_cluster
|
||||
'';
|
||||
|
||||
disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
# aarch64-linux fails cpuinfo test, because /sys/devices/system/cpu/ does not exist in the sandbox:
|
||||
# RuntimeError: Failed to initialize cpuinfo!
|
||||
"test_fps"
|
||||
"test_nearest"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "PyTorch Extension Library of Optimized Graph Cluster Algorithms";
|
||||
homepage = "https://github.com/rusty1s/pytorch_cluster";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
})
|
||||
|
|
@ -7,7 +7,9 @@
|
|||
fontconfig,
|
||||
glib,
|
||||
harfbuzz,
|
||||
makeFontsConf,
|
||||
pango,
|
||||
twemoji-color-font,
|
||||
|
||||
# build-system
|
||||
flit-core,
|
||||
|
|
@ -32,7 +34,7 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "weasyprint";
|
||||
version = "68.0";
|
||||
version = "68.1-unstable-2026-05-18";
|
||||
pyproject = true;
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
|
@ -40,8 +42,10 @@ buildPythonPackage (finalAttrs: {
|
|||
src = fetchFromGitHub {
|
||||
owner = "Kozea";
|
||||
repo = "WeasyPrint";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-kAJgSQz1RKrPwzO7I5xHXyXcXYJtvca9izjrAgTy3ek=";
|
||||
# Includes upstream's Ghostscript 10.07-compatible rasterization tests.
|
||||
# Drop the pin when the next WeasyPrint release is packaged.
|
||||
rev = "2cb9b3d2378c67e2bfde646344ca4c2cb7c0f25f";
|
||||
hash = "sha256-zQ8gvYy72ROMwprT5dWA3N1vC7y+6ZKNwKESwtPS21w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -99,19 +103,28 @@ buildPythonPackage (finalAttrs: {
|
|||
"test_woff_simple"
|
||||
# AssertionError
|
||||
"test_2d_transform"
|
||||
# Reported upstream: https://github.com/Kozea/WeasyPrint/issues/2666
|
||||
"test_text_stroke"
|
||||
];
|
||||
|
||||
env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
|
||||
|
||||
# Test include some emoji characters that require a custom fontconfig configuration to be found.
|
||||
preCheck = ''
|
||||
export FONTCONFIG_FILE=${makeFontsConf { fontDirectories = [ twemoji-color-font ]; }}
|
||||
'';
|
||||
|
||||
# Set env variable explicitly for Darwin, but allow overriding when invoking directly
|
||||
makeWrapperArgs = [ "--set-default FONTCONFIG_FILE ${finalAttrs.env.FONTCONFIG_FILE}" ];
|
||||
|
||||
# Upstream still reports the last release version from weasyprint.__version__.
|
||||
# Remove when the next release is packaged.
|
||||
preVersionCheck = ''
|
||||
version=68.1
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "weasyprint" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/Kozea/WeasyPrint/releases/tag/${finalAttrs.src.tag}";
|
||||
changelog = "https://github.com/Kozea/WeasyPrint/commits/${finalAttrs.src.rev}";
|
||||
description = "Converts web documents to PDF";
|
||||
homepage = "https://weasyprint.org/";
|
||||
license = lib.licenses.bsd3;
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
}:
|
||||
mkKdeDerivation rec {
|
||||
pname = "kirigami-addons";
|
||||
version = "1.12.0";
|
||||
version = "1.12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/kirigami-addons/kirigami-addons-${version}.tar.xz";
|
||||
hash = "sha256-UTBR3/hBfaGBnWronWwhoDZUyaYIkd9g32q6E98Z0hs=";
|
||||
hash = "sha256-xUOkk85YdfQF+xyf9tUxBg7QgsxtcQ5W1GrELRZCB7s=";
|
||||
};
|
||||
|
||||
extraNativeBuildInputs = [ qttools ];
|
||||
|
|
|
|||
40
pkgs/os-specific/linux/busybox/CVE-2025-60876.patch
Normal file
40
pkgs/os-specific/linux/busybox/CVE-2025-60876.patch
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
From radoslav.kolev at suse.com Fri Nov 21 09:21:18 2025
|
||||
From: radoslav.kolev at suse.com (Radoslav Kolev)
|
||||
Date: Fri, 21 Nov 2025 11:21:18 +0200
|
||||
Subject: [PATCH v2 1/1] wget: don't allow control characters or spaces in the
|
||||
URL
|
||||
In-Reply-To: <20251121092118.3562853-1-radoslav.kolev@suse.com>
|
||||
References: <20251121092118.3562853-1-radoslav.kolev@suse.com>
|
||||
Message-ID: <20251121092118.3562853-2-radoslav.kolev@suse.com>
|
||||
|
||||
Fixes CVE-2025-60876 malicious URL can be used to inject
|
||||
HTTP headers in the request.
|
||||
|
||||
Signed-off-by: Radoslav Kolev <radoslav.kolev at suse.com>
|
||||
Reviewed-by: Emmanuel Deloget <logout at free.fr>
|
||||
---
|
||||
networking/wget.c | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/networking/wget.c b/networking/wget.c
|
||||
index ec3767793..fa555427b 100644
|
||||
--- a/networking/wget.c
|
||||
+++ b/networking/wget.c
|
||||
@@ -536,6 +536,15 @@ static void parse_url(const char *src_url, struct host_info *h)
|
||||
{
|
||||
char *url, *p, *sp;
|
||||
|
||||
+ /* Fix for CVE-2025-60876 - don't allow control characters or spaces in the URL */
|
||||
+ /* otherwise a malicious URL can be used to inject HTTP headers in the request */
|
||||
+ const unsigned char *u = (void *) src_url;
|
||||
+ while (*u) {
|
||||
+ if (*u <= ' ')
|
||||
+ bb_simple_error_msg_and_die("Unencoded control character found in the URL!");
|
||||
+ u++;
|
||||
+ }
|
||||
+
|
||||
free(h->allocated);
|
||||
h->allocated = url = xstrdup(src_url);
|
||||
|
||||
--
|
||||
2.51.1
|
||||
|
|
@ -98,6 +98,10 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
# https://lists.busybox.net/pipermail/busybox/2026-March/092010.html
|
||||
./build-system-buffer-overflow.patch
|
||||
|
||||
# [PATCH v2 1/1] wget: don't allow control characters or spaces in the URL
|
||||
# https://lists.busybox.net/pipermail/busybox/2025-November/091840.html
|
||||
./CVE-2025-60876.patch
|
||||
]
|
||||
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2026.5.2";
|
||||
version = "2026.5.3";
|
||||
components = {
|
||||
"3_day_blinds" =
|
||||
ps: with ps; [
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
buildHomeAssistantComponent rec {
|
||||
owner = "mampfes";
|
||||
domain = "waste_collection_schedule";
|
||||
version = "2.23.0";
|
||||
version = "2.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner;
|
||||
repo = "hacs_waste_collection_schedule";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-YZBIh828kYhRxoRe5uIUJY4ZPJuJYZKCfA6BF/Fx2nk=";
|
||||
hash = "sha256-fCtgEfaoI9IVEpe3YMFb8IkzNmGalueZaGv9JpS35Ok=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
|
|
|
|||
|
|
@ -262,7 +262,7 @@ let
|
|||
extraBuildInputs = extraPackages python.pkgs;
|
||||
|
||||
# Don't forget to run update-component-packages.py after updating
|
||||
hassVersion = "2026.5.2";
|
||||
hassVersion = "2026.5.3";
|
||||
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
|
|
@ -283,13 +283,13 @@ python.pkgs.buildPythonApplication rec {
|
|||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
tag = version;
|
||||
hash = "sha256-fKHYlXb1j5A6vQ3B/Pb2O7WD6t9ubsNQXc9f/gK79Pk=";
|
||||
hash = "sha256-U3P97V/3+4eKMPyT6JzqLiDgei84iEOyWdknFvJBn1o=";
|
||||
};
|
||||
|
||||
# Secondary source is pypi sdist for translations
|
||||
sdist = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Zt+I/gaIyVAAgL9MF3T0WxivqY3D28tdtJX+GLbSES0=";
|
||||
hash = "sha256-SAeqGo+fTQG//Abix+6pjHKQJY1XBrNL7IexgqoXsYc=";
|
||||
};
|
||||
|
||||
build-system = with python.pkgs; [
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-homeassistant-custom-component";
|
||||
version = "0.13.331";
|
||||
version = "0.13.332";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.13";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "MatthewFlamm";
|
||||
repo = "pytest-homeassistant-custom-component";
|
||||
tag = version;
|
||||
hash = "sha256-sFL2O/uPrb45c1QrLLwnAcII2sUO7BhuWA1MuzXJKTE=";
|
||||
hash = "sha256-zkRmuNUmRVvnIwIx494xzFKT0/00GZzkVo6cva9tut4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "homeassistant-stubs";
|
||||
version = "2026.5.2";
|
||||
version = "2026.5.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = python.version != home-assistant.python.version;
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "KapJI";
|
||||
repo = "homeassistant-stubs";
|
||||
tag = version;
|
||||
hash = "sha256-BTYgsaOr82eqD2Cwf/Se1i2zUr6/cKgHaynCyGQKSAQ=";
|
||||
hash = "sha256-kgfnT+qTsbB3T8PPsSA698QcxcM1o1QW8hLnfXjGm5M=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -146,6 +146,17 @@ let
|
|||
# [2026.5.2] Failed: Description not found for placeholder `modulation` in component.novy_cooker_hood.config.abort.no_compatible_transmitters
|
||||
"test_no_compatible_transmitters"
|
||||
];
|
||||
tractive = [
|
||||
# [2026.5.3] Entity does not get set up
|
||||
"test_binary_sensor"
|
||||
"test_sensor"
|
||||
"test_switch"
|
||||
"test_switch_on"
|
||||
"test_switch_off"
|
||||
"test_switch_on_with_exception"
|
||||
"test_switch_off_with_exception"
|
||||
"test_switch_unavailable"
|
||||
];
|
||||
zeroconf = [
|
||||
# multicast socket bind, not possible in the sandbox
|
||||
"test_subscribe_discovery"
|
||||
|
|
|
|||
|
|
@ -516,6 +516,7 @@ mapAliases {
|
|||
clima = throw "'clima' has been removed, as it has been unmaintained upstream since December 2024, use glow instead"; # Added 2026-01-01
|
||||
clipbuzz = throw "clipbuzz has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09
|
||||
clipgrab = throw "'clipgrab' has been removed, as it was unmaintained in nixpkgs since 2022 and depended on vulnerable qt5 webengine."; # Added 2026-02-11
|
||||
clipit = throw "'clipit' has been removed as it is unmaintained upstream and broken"; # Added 2026-05-16
|
||||
cloudlogoffline = throw "cloudlogoffline has been removed"; # Added 2025-05-18
|
||||
clucene_core = warnAlias "'clucene_core' has been renamed to 'clucene-core'" clucene-core; # Added 2026-01-12
|
||||
clucene_core_2 = warnAlias "'clucene_core_2' has been renamed to 'clucene-core_2'" clucene-core_2; # Added 2026-01-12
|
||||
|
|
@ -792,6 +793,7 @@ mapAliases {
|
|||
forge = throw "forge was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
|
||||
forgejo-actions-runner = throw "'forgejo-actions-runner' has been renamed to/replaced by 'forgejo-runner'"; # Converted to throw 2025-10-27
|
||||
fractal-next = throw "'fractal-next' has been renamed to/replaced by 'fractal'"; # Converted to throw 2025-10-27
|
||||
framac = frama-c; # Added 2026-04-24
|
||||
framework-system-tools = throw "'framework-system-tools' has been renamed to/replaced by 'framework-tool'"; # Converted to throw 2025-10-27
|
||||
francis = throw "'francis' has been renamed to/replaced by 'kdePackages.francis'"; # Converted to throw 2025-10-27
|
||||
freebsdCross = throw "'freebsdCross' has been renamed to/replaced by 'freebsd'"; # Converted to throw 2025-10-27
|
||||
|
|
|
|||
|
|
@ -676,7 +676,7 @@ let
|
|||
fpath = callPackage ../development/ocaml-modules/fpath { };
|
||||
|
||||
frama-c = callPackage ../development/ocaml-modules/frama-c {
|
||||
framac = pkgs.framac.override {
|
||||
frama-c = pkgs.frama-c.override {
|
||||
ocamlPackages = self;
|
||||
why3 = pkgs.why3.override { ocamlPackages = self; };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -11439,6 +11439,8 @@ self: super: with self; {
|
|||
|
||||
nvdlib = callPackage ../development/python-modules/nvdlib { };
|
||||
|
||||
nvidia-cutlass = callPackage ../development/python-modules/nvidia-cutlass { };
|
||||
|
||||
nvidia-dlprof-pytorch-nvtx =
|
||||
callPackage ../development/python-modules/nvidia-dlprof-pytorch-nvtx
|
||||
{ };
|
||||
|
|
@ -19742,6 +19744,8 @@ self: super: with self; {
|
|||
|
||||
torch-c-dlpack-ext = callPackage ../development/python-modules/torch-c-dlpack-ext { };
|
||||
|
||||
torch-cluster = callPackage ../development/python-modules/torch-cluster { };
|
||||
|
||||
torch-einops-utils = callPackage ../development/python-modules/torch-einops-utils { };
|
||||
|
||||
torch-geometric = callPackage ../development/python-modules/torch-geometric { };
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue