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

Merge master into staging-nixos

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-10-29 00:19:08 +00:00
committed by GitHub
parent 1294e05b51 cb578a48af
commit 6554835c47
157 changed files with 2392 additions and 1814 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci/OWNERS
+1 -1
View File
@@ -343,7 +343,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
/pkgs/top-level/agda-packages.nix @NixOS/agda
/pkgs/development/libraries/agda @NixOS/agda
/doc/languages-frameworks/agda.section.md @NixOS/agda
/nixos/tests/agda.nix @NixOS/agda
/nixos/tests/agda @NixOS/agda
# Idris
/pkgs/development/idris-modules @Infinisil
maintainers/maintainer-list.nix
+5
View File
@@ -4254,6 +4254,11 @@
githubId = 498906;
name = "Karolis Stasaitis";
};
carlostome = {
name = "Carlos Tomé Cortiñas";
github = "carlostome";
githubId = 2206578;
};
carlsverre = {
email = "accounts@carlsverre.com";
github = "carlsverre";
maintainers/team-list.nix
+1 -11
View File
@@ -351,17 +351,7 @@ with lib.maintainers;
};
formatter = {
members = [
piegames
infinisil
das_j
_0x4A6F
MattSturgeon
jfly
Sereja313
];
scope = "Nix formatting team: https://nixos.org/community/teams/formatting/";
shortName = "Nix formatting team";
github = "nix-formatting";
};
freedesktop = {
nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
+1
View File
@@ -1353,6 +1353,7 @@ in
netmask = mkCommaSepListParam [ ] "Address or CIDR subnets";
server = mkCommaSepListParam [ ] "Address or CIDR subnets";
subnet = mkCommaSepListParam [ ] "Address or CIDR subnets";
p_cscf = mkCommaSepListParam [ ] "Address or CIDR subnets";
split_include = mkCommaSepListParam [ ] "Address or CIDR subnets";
split_exclude = mkCommaSepListParam [ ] "Address or CIDR subnets";
}
nixos/tests/agda.nix → nixos/tests/agda/base.nix
+5 -7
View File
@@ -1,13 +1,7 @@
{ pkgs, ... }:
let
hello-world = pkgs.writeText "hello-world" ''
{-# OPTIONS --guardedness #-}
open import IO
open import Level
main = run {0ℓ} (putStrLn "Hello World!")
'';
hello-world = ./files/HelloWorld.agda;
in
{
name = "agda";
@@ -30,6 +24,10 @@ in
};
testScript = ''
# agda and agda-mode are in path
machine.succeed("agda --version")
machine.succeed("agda-mode")
# Minimal script that typechecks
machine.succeed("touch TestEmpty.agda")
machine.succeed("agda TestEmpty.agda")
nixos/tests/agda/default.nix
+5
View File
@@ -0,0 +1,5 @@
{ runTest }:
{
base = runTest ./base.nix;
override-with-backend = runTest ./override-with-backend.nix;
}
nixos/tests/agda/files/HelloWorld.agda
+5
View File
@@ -0,0 +1,5 @@
{-# OPTIONS --guardedness #-}
open import IO
open import Level
main = run {0ℓ} (putStrLn "Hello World!")
nixos/tests/agda/files/TrivialBackend.hs
+6
View File
@@ -0,0 +1,6 @@
module Main where
import Agda.Main ( runAgda )
main :: IO ()
main = runAgda []
nixos/tests/agda/override-with-backend.nix
+65
View File
@@ -0,0 +1,65 @@
{ pkgs, ... }:
let
mainProgram = "agda-trivial-backend";
hello-world = ./files/HelloWorld.agda;
agda-trivial-backend = pkgs.stdenvNoCC.mkDerivation {
name = "trivial-backend";
meta = { inherit mainProgram; };
version = "${pkgs.haskellPackages.Agda.version}";
src = ./files/TrivialBackend.hs;
buildInputs = [
(pkgs.haskellPackages.ghcWithPackages (pkgs: [ pkgs.Agda ]))
];
dontUnpack = true;
buildPhase = ''
ghc $src -o ${mainProgram}
'';
installPhase = ''
mkdir -p $out/bin
cp ${mainProgram} $out/bin
'';
};
in
{
name = "agda-trivial-backend";
meta = with pkgs.lib.maintainers; {
maintainers = [
carlostome
];
};
nodes.machine =
{ pkgs, ... }:
let
agdaPackages = pkgs.agdaPackages.override (oldAttrs: {
Agda = agda-trivial-backend;
});
in
{
environment.systemPackages = [
(agdaPackages.agda.withPackages {
pkgs = p: [ p.standard-library ];
})
];
virtualisation.memorySize = 2000; # Agda uses a lot of memory
};
testScript = ''
# agda and agda-mode are not in path
machine.fail("agda --version")
machine.fail("agda-mode")
# backend is present
text = machine.succeed("${mainProgram} --help")
assert "${mainProgram}" in text
# Hello world
machine.succeed(
"cp ${hello-world} HelloWorld.agda"
)
machine.succeed("${mainProgram} -l standard-library -i . -c HelloWorld.agda")
# Check execution
text = machine.succeed("./HelloWorld")
assert "Hello World!" in text, f"HelloWorld does not run properly: output was {text}"
'';
}
nixos/tests/all-tests.nix
+3 -1
View File
@@ -203,7 +203,9 @@ in
adguardhome = runTest ./adguardhome.nix;
aesmd = runTestOn [ "x86_64-linux" ] ./aesmd.nix;
agate = runTest ./web-servers/agate.nix;
agda = runTest ./agda.nix;
agda = import ./agda {
inherit runTest;
};
age-plugin-tpm-decrypt = runTest ./age-plugin-tpm-decrypt.nix;
agnos = discoverTests (import ./agnos.nix);
agorakit = runTest ./web-apps/agorakit.nix;
pkgs/applications/editors/vscode/extensions/default.nix
+2 -2
View File
@@ -5050,8 +5050,8 @@ let
mktplcRef = {
publisher = "vscjava";
name = "vscode-java-dependency";
version = "0.26.1";
hash = "sha256-7CjI+l1M/yW7BgzP1YirNI72ub+JZ6HI/xagYzdfx0E=";
version = "0.26.2";
hash = "sha256-msRaLNS1a5BXY3GN1MmOi9jBbNj6aqJDbZkFc1pLG3I=";
};
meta = {
license = lib.licenses.mit;
pkgs/applications/graphics/pymeshlab/default.nix
+65 -68
View File
@@ -1,106 +1,103 @@
{
stdenv,
lib,
stdenv,
fetchFromGitHub,
libGLU,
qtbase,
qtscript,
qtxmlpatterns,
lib3ds,
bzip2,
muparser,
eigen,
glew,
gmp,
levmar,
qhull,
fetchpatch,
# nativeBuildInputs
cmake,
cgal,
boost,
mpfr,
xercesc,
onetbb,
embree,
vcg,
libigl,
corto,
openctm,
structuresynth,
wrapQtAppsHook,
python3Packages,
# propagatedBuildInputs
meshlab,
# buildInputs
libsForQt5,
llvmPackages,
glew,
vcg,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "pymeshlab";
version = "2023.12";
version = "2025.7";
src = fetchFromGitHub {
owner = "cnr-isti-vclab";
repo = "pymeshlab";
rev = "v${finalAttrs.version}";
hash = "sha256-IOlRdXoUPOJt67g3HqsLchV5aL+JUEks2y1Sy+wpwsg=";
fetchSubmodules = true;
tag = "v${finalAttrs.version}";
hash = "sha256-LCR2/AyX9uVX4xhZareUL6YlpUsCFiGDMBB5nFp+H6k=";
};
buildInputs = [
libGLU
qtbase
qtscript
qtxmlpatterns
lib3ds
bzip2
muparser
eigen
glew
gmp
levmar
qhull
cgal
boost
mpfr
xercesc
onetbb
embree
vcg
libigl
corto
structuresynth
openctm
patches = [
# CMake: allow use of system-provided meshlab & pybind11
# ref. https://github.com/cnr-isti-vclab/PyMeshLab/pull/445
# merged upstream
(fetchpatch {
url = "https://github.com/cnr-isti-vclab/PyMeshLab/commit/b363caae4362746b3f9e9326fe7b72a2ec7824d9.patch";
hash = "sha256-euKfOx/T0qdeMx79dpEalzmdWsr4nbDFJfKdksvULBw=";
})
];
nativeBuildInputs = [
cmake
wrapQtAppsHook
python3Packages.pybind11
];
nativeCheckInputs = [
python3Packages.pythonImportsCheckHook
];
propagatedBuildInputs = [
meshlab
python3Packages.numpy
];
preConfigure = ''
substituteInPlace src/meshlab/src/external/libigl.cmake \
--replace-fail '$'{MESHLAB_EXTERNAL_DOWNLOAD_DIR}/libigl-2.4.0 ${libigl}
substituteInPlace src/meshlab/src/external/nexus.cmake \
--replace-fail '$'{NEXUS_DIR}/src/corto ${corto.src}
substituteInPlace src/meshlab/src/external/levmar.cmake \
--replace-fail '$'{LEVMAR_LINK} ${levmar.src} \
--replace-warn "MD5 ''${LEVMAR_MD5}" ""
substituteInPlace src/meshlab/src/external/ssynth.cmake \
--replace-fail '$'{SSYNTH_LINK} ${structuresynth.src} \
--replace-warn "MD5 ''${SSYNTH_MD5}" ""
'';
buildInputs = [
glew
libsForQt5.qtbase
vcg
]
++ lib.optionals stdenv.cc.isClang [
llvmPackages.openmp
];
dontWrapQtApps = true;
cmakeFlags = [
"-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/${python3Packages.python.sitePackages}/pymeshlab"
"-DVCGDIR=${vcg.src}"
];
# Get io & filter plugins from meshlab, to avoild render, decorate & edit ones
postInstall =
let
plugins =
if stdenv.hostPlatform.isDarwin then
"Applications/meshlab.app/Contents/PlugIns"
else
"lib/meshlab/plugins";
pyPlugins = if stdenv.hostPlatform.isDarwin then "PlugIns" else "lib/plugins";
in
''
install -D -t $out/${python3Packages.python.sitePackages}/pymeshlab/${pyPlugins} \
${meshlab}/${plugins}/libio_* \
${meshlab}/${plugins}/libfilter_*
'';
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
patchelf \
--add-needed ${meshlab}/lib/meshlab/libmeshlab-common.so \
$out/${python3Packages.python.sitePackages}/pymeshlab/pmeshlab.*.so
'';
pythonImportsCheck = [ "pymeshlab" ];
meta = {
description = "Open source mesh processing python library";
homepage = "https://github.com/cnr-isti-vclab/PyMeshLab";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ nim65s ];
platforms = with lib.platforms; linux;
platforms = with lib.platforms; linux ++ darwin;
};
})
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+825 -825
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/browsers/firefox/packages/firefox.nix
+2 -2
View File
@@ -9,10 +9,10 @@
buildMozillaMach rec {
pname = "firefox";
version = "144.0";
version = "144.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "e1f924ed006a31f5333ea6af219c1fb90d4866e5889ac634c324a3e80b042a7e0b2b9aeb798672ea1a434fbf817fc0b82a12ec0fb405a48e3a2ca21cc394445e";
sha512 = "87eebabab2c85eb32b2d1161e520f56e271a4893c8cd4d8225fc7b498a9883496315854a758478fb4edd061674a9f7c0503e9b9f0eb4503b1f89203774d02f97";
};
meta = {
pkgs/build-support/agda/default.nix
+6 -4
View File
@@ -45,7 +45,7 @@ let
}:
let
libraryFile = mkLibraryFile pkgs;
pname = "agdaWithPackages";
pname = "${Agda.meta.mainProgram}WithPackages";
version = Agda.version;
in
runCommand "${pname}-${version}"
@@ -68,10 +68,12 @@ let
}
''
mkdir -p $out/bin
makeWrapper ${lib.getExe Agda} $out/bin/agda \
makeWrapper ${lib.getExe Agda} $out/bin/${Agda.meta.mainProgram} \
${lib.optionalString (ghc != null) ''--add-flags "--with-compiler=${ghc}/bin/ghc"''} \
--add-flags "--library-file=${libraryFile}"
ln -s ${lib.getExe' Agda "agda-mode"} $out/bin/agda-mode
if [ -e ${lib.getExe' Agda "agda-mode"} ]; then
ln -s ${lib.getExe' Agda "agda-mode"} $out/bin/agda-mode
fi
'';
withPackages = arg: if isAttrs arg then withPackages' arg else withPackages' { pkgs = arg; };
@@ -116,7 +118,7 @@ let
else
''
runHook preBuild
agda --build-library
${lib.getExe agdaWithPkgs} --build-library
runHook postBuild
'';
pkgs/by-name/be/bento/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "bento";
version = "1.12.0";
version = "1.12.1";
src = fetchFromGitHub {
owner = "warpstreamlabs";
repo = "bento";
tag = "v${version}";
hash = "sha256-BrGYMOXSRYoCE29KQU07LaK8HQ1+QrMusYejL5SrpXk=";
hash = "sha256-KW/qq2hntXcG26atA1yRJUzSMns0e1n2U5nascU1Ci8=";
};
proxyVendor = true;
pkgs/by-name/bn/bngblaster/package.nix
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bngblaster";
version = "0.9.25";
version = "0.9.26";
src = fetchFromGitHub {
owner = "rtbrick";
repo = "bngblaster";
rev = finalAttrs.version;
hash = "sha256-imbTZLq7yFxh/qaigySNaBBLqkJS1zY/gwjLslj3Jv4=";
hash = "sha256-EZc+cageuhPSIwyHAW6JTbSGQwlHCl9YpUHzHZ0ygx0=";
};
nativeBuildInputs = [ cmake ];
pkgs/by-name/ca/cairo/package.nix
+3 -1
View File
@@ -100,8 +100,10 @@ stdenv.mkDerivation (
linux = "true";
freebsd = "true";
netbsd = "false";
windows = "false";
}
.${stdenv.hostPlatform.parsed.kernel.name} or (throw "Unknown value for ipc_rmid_deferred_release")
.${stdenv.hostPlatform.parsed.kernel.name}
or (throw "Unknown value for ipc_rmid_deferred_release on ${stdenv.hostPlatform.parsed.kernel.name}")
}
''}"
];
pkgs/by-name/ch/checkov/package.nix
+2 -2
View File
@@ -37,14 +37,14 @@ with py.pkgs;
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.487";
version = "3.2.488";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
tag = version;
hash = "sha256-g+1/3NbLVCOTWMuo8Jn7JlSgOFvum1tvnjBm3paj7is=";
hash = "sha256-j1NcGruoYrZfaeKZZ6iNPg8k2v5L7srrSgaHXmX8eec=";
};
pythonRelaxDeps = [
pkgs/by-name/cn/cnspec/package.nix
+3 -3
View File
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "cnspec";
version = "12.6.0";
version = "12.7.0";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnspec";
tag = "v${version}";
hash = "sha256-wV3LzrATUlNdPuqh/uB+EPeAPqbfWXEEhtctOIxJrWs=";
hash = "sha256-IQ+DwgWEVrMnkgAgHjFg/NDn2mkHggnlT3xgbSvN/pU=";
};
proxyVendor = true;
vendorHash = "sha256-NDwPDij1dFpBjgePyQ7y2f4BIMl92ugDAYNOZJk+6bs=";
vendorHash = "sha256-0VoGgBBgloUG6NppX1muNqAyZdzyrc9Tcs3wNaLRdVY=";
subPackages = [ "apps/cnspec" ];
pkgs/by-name/co/corto/package.nix
+24 -8
View File
@@ -2,26 +2,42 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
nix-update-script,
}:
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "corto";
version = "0-unstable-2024-04-05";
version = "2025.07";
src = fetchFromGitHub {
owner = "cnr-isti-vclab";
repo = "corto";
rev = "d880519c490c88a39d12c31a914b6a687a7019c3";
hash = "sha256-0OUijrf+0ZNv3oYko2r8Kp9zgtg8b9RPL7DXHf15Ryc=";
tag = "v${finalAttrs.version}";
hash = "sha256-wfIZQdypBTfUZJgPE4DetSt1SUNSyZihmL1Uzapqh1o=";
};
patches = [
# CMake: exports
# ref. https://github.com/cnr-isti-vclab/corto/pull/47
# merged upstream
(fetchpatch {
name = "cmake-exports.patch";
url = "https://github.com/cnr-isti-vclab/corto/commit/169356e97b29587b278822118aef34ed742b6b37.patch";
hash = "sha256-imJfQ8JEhCcSkkO35N7Z3NtGElCyVxENPMDMWfNqdW0=";
})
];
nativeBuildInputs = [ cmake ];
meta = with lib; {
updateScript = nix-update-script { };
meta = {
description = "Mesh compression library, designed for rendering and speed";
homepage = "https://github.com/cnr-isti-vclab/corto";
license = licenses.mit;
maintainers = with maintainers; [ nim65s ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ nim65s ];
mainProgram = "corto";
};
}
})
pkgs/by-name/co/cosmic-applets/package.nix
+3 -3
View File
@@ -20,17 +20,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-applets";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-applets";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-KNlWOQjISvuZdaf6pXUVh6pyUm1sjmI77iAizEXdE8s=";
hash = "sha256-hBqsFiH2zKwGN9tWEf4iDoVcwssj7YN+7+2ooVNKszs=";
};
cargoHash = "sha256-Apae3sJ27yVRl7Lf+SGsxM0zMlSFkdp6Q3BQoY5u3r4=";
cargoHash = "sha256-HLbcTDwS5IvolEMb0bZr4CPjtEjZI8G+AggXifIDiKM=";
nativeBuildInputs = [
just
pkgs/by-name/co/cosmic-applibrary/package.nix
+3 -3
View File
@@ -11,17 +11,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-applibrary";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-applibrary";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-YfcLcM67RICTSFhMCyAcx1RPwnpN107Kov6BM0jxGPM=";
hash = "sha256-KmLRXQMpJ7kO5gTguLgtX5rztDyEqyRhaqlWzlfDth4=";
};
cargoHash = "sha256-s2YiB4U/pVAul2YC5/6bCVwKd18odoTAua4YhUJDN3U=";
cargoHash = "sha256-CX1/6fXL63P1J6yjvFKd91WqSf4+mf+GOtX1O9fHfgg=";
nativeBuildInputs = [
just
pkgs/by-name/co/cosmic-bg/package.nix
+1 -1
View File
@@ -13,7 +13,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-bg";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
pkgs/by-name/co/cosmic-comp/package.nix
+3 -3
View File
@@ -20,17 +20,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-comp";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-comp";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-wmXkbyczPFBw6264Om7/k8jnhPpa43Y18TL0qMn18mI=";
hash = "sha256-vdpKxXkC6Z8ySa21jZ5zF2aqwLY7dt2FpQbfbZkgu+c=";
};
cargoHash = "sha256-hqw5nGKP0nw00qQoHyrcryVg2Kkdnx6yyJIERbh3DFE=";
cargoHash = "sha256-Gk2vXmVMcDWg3VnI0176eKF65tAfPwVZ74oQtD0UBO8=";
separateDebugInfo = true;
pkgs/by-name/co/cosmic-edit/package.nix
+3 -3
View File
@@ -16,17 +16,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-edit";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-edit";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-hmPYdKU+QgksqD2CCutDfm6lVKoplTOhle2s9RVM5Gs=";
hash = "sha256-xlw4lLfg5d9lyl3+efv6GBLtBvuFex4Zbnos2HbKp20=";
};
cargoHash = "sha256-s7vJqRzx2hg6SZ+uVOSoy+xHg6nEls6GbVfi8zT2QAw=";
cargoHash = "sha256-Ot69WdCvdT8xg3/LPMb8C5Rdq04Mvmr5VLS+adnvuvY=";
postPatch = ''
substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
pkgs/by-name/co/cosmic-files/package.nix
+3 -3
View File
@@ -12,17 +12,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-files";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-files";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-F0h/OYRuKJw9/kQ1WWnD6AoiGLF+09IxARe45AAKV7c=";
hash = "sha256-DbxA2lAPVNdel02NeuACucCyGcsNjT0MxJMzeGF3JzY=";
};
cargoHash = "sha256-GnYEZgatMlTu0tK7zsiCNSAwSwnTmZhyqotYBIVCHuc=";
cargoHash = "sha256-TovOJVe16VJZ9Ul2JQc/No8f0WzaYfWI1LmzhHxdKsM=";
nativeBuildInputs = [
just
pkgs/by-name/co/cosmic-greeter/package.nix
+2 -2
View File
@@ -19,14 +19,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-greeter";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-greeter";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-MI0iqDnBtN3gkRo8u9eA3z89aU8XF1szxTG07zOtaFI=";
hash = "sha256-kp5DSr/RxWhv35VKAc8xSAprM1Hbo84/oB8h0XBSmTE=";
};
cargoHash = "sha256-4yRBgFrH4RBpuvChTED+ynx+PyFumoT2Z+R1gXxF4Xc=";
pkgs/by-name/co/cosmic-icons/package.nix
+1 -1
View File
@@ -9,7 +9,7 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "cosmic-icons";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
pkgs/by-name/co/cosmic-idle/package.nix
+1 -1
View File
@@ -16,7 +16,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-idle";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
pkgs/by-name/co/cosmic-initial-setup/package.nix
+1 -1
View File
@@ -14,7 +14,7 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-initial-setup";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
pkgs/by-name/co/cosmic-launcher/package.nix
+3 -3
View File
@@ -11,17 +11,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-launcher";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-launcher";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-QqJ59e0UxnNjbsIjsoeZaUhc1WfVpQtorzDVewJNpIo=";
hash = "sha256-xhK80oKZFFvz+dPKBm1hcVXk9G7GofqEmwAdyzhOJqI=";
};
cargoHash = "sha256-bW6XtdK+AZiuwfzBUWmUi00RJXeuzgzGKoL35lyDBfM=";
cargoHash = "sha256-2kkKPU4iEsInLwJyEyJ15/T1pVfDsKD69DISGilNWws=";
nativeBuildInputs = [
just
pkgs/by-name/co/cosmic-notifications/package.nix
+1 -1
View File
@@ -12,7 +12,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-notifications";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
pkgs/by-name/co/cosmic-osd/package.nix
+1 -1
View File
@@ -13,7 +13,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-osd";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
pkgs/by-name/co/cosmic-panel/package.nix
+1 -1
View File
@@ -11,7 +11,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-panel";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
pkgs/by-name/co/cosmic-player/package.nix
+2 -2
View File
@@ -18,14 +18,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-player";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-player";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-e2BBXfPUl9L/cyPAEwkoS0Z3JrW5/K7cpreP5jcW/c4=";
hash = "sha256-+LMXtiUxal4xSmtG9vHDSZxwzyjOhmS6ZZ7HppB7p7w=";
};
cargoHash = "sha256-fnX5BkzRAetKxHZ9XyWdmG6TSxFqGJsmg16zlpYG9Ag=";
pkgs/by-name/co/cosmic-randr/package.nix
+1 -1
View File
@@ -12,7 +12,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-randr";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
pkgs/by-name/co/cosmic-screenshot/package.nix
+1 -1
View File
@@ -10,7 +10,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-screenshot";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
pkgs/by-name/co/cosmic-session/package.nix
+1 -1
View File
@@ -11,7 +11,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-session";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
pkgs/by-name/co/cosmic-settings-daemon/package.nix
+2 -2
View File
@@ -15,14 +15,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-settings-daemon";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-settings-daemon";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-CtHy8qy7CatbErNZKu1pLFC9aUWLj0r87+lvRB16oSE=";
hash = "sha256-WLZJx8FwseCD7hHU60+HekNBxUE6B/6HRhP8oqokTNI=";
};
postPatch = ''
pkgs/by-name/co/cosmic-settings/package.nix
+2 -2
View File
@@ -27,14 +27,14 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-settings";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-settings";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-vCNiMNHRzdntys8XHwOS8g72EXncGJVH6U7b6AW4BUQ=";
hash = "sha256-n7+8XKDCTyjpJff/0o5VY5NbcQe9i+pn3Mgf8IV12m0=";
};
cargoHash = "sha256-mMfKY+ouszbN2rEf6zvv1Sc1FEZ/ZVuQ6RXGMBFDwIE=";
pkgs/by-name/co/cosmic-store/package.nix
+2 -2
View File
@@ -15,14 +15,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-store";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-store";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-G335fS65CApkuUsqRcDgT2ZEBWfiPQ1R84tLZ62Cyig=";
hash = "sha256-D/P6abNqH++GWBfqZYqGjH3YV+jyyBo/8R3veLm1NRo=";
};
cargoHash = "sha256-nJLowAuWvj5JfmPyExQyfCJ9pqNJ0OdzPPku9z7RDWc=";
pkgs/by-name/co/cosmic-term/package.nix
+3 -3
View File
@@ -15,17 +15,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-term";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-term";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-BdWyKRoBZybRrtyBfJlRJxVPIIJWY3F8Ei8UgMfVPJo=";
hash = "sha256-U1/6IgnqNN9ccnh0IFuDkkurFN0JxmXJltns6Vv6/9A=";
};
cargoHash = "sha256-qXAgmVsjhr3aqEQRGjsK2JM8YwpkRK5Y+XYJRSZ8Swc=";
cargoHash = "sha256-oiZjX53CQA53mMNfmmnyzWGAiZRA+4BxOxEvbEFd8q8=";
nativeBuildInputs = [
just
pkgs/by-name/co/cosmic-wallpapers/package.nix
+1 -1
View File
@@ -7,7 +7,7 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "cosmic-wallpapers";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
+1 -1
View File
@@ -14,7 +14,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-workspaces-epoch";
version = "1.0.0-beta.3";
version = "1.0.0-beta.4";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
pkgs/by-name/cr/credhub-cli/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "credhub-cli";
version = "2.9.50";
version = "2.9.51";
src = fetchFromGitHub {
owner = "cloudfoundry-incubator";
repo = "credhub-cli";
rev = version;
sha256 = "sha256-+Y+PmnCQCCpGvThzbW6byquwFx3Pz96Je0+yWWMh3BQ=";
sha256 = "sha256-BFlPKkk8t6WWbDB4Z0Bsizumd0flO1GqedVSWHKlwgE=";
};
# these tests require network access that we're not going to give them
pkgs/by-name/cu/cura-appimage/package.nix
+2 -2
View File
@@ -13,7 +13,7 @@
stdenvNoCC.mkDerivation rec {
pname = "cura-appimage";
version = "5.10.2";
version = "5.11.0";
# Give some good names so the intermediate packages are easy
# to recognise by name in the Nix store.
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
src = fetchurl {
url = "https://github.com/Ultimaker/Cura/releases/download/${version}/Ultimaker-Cura-${version}-linux-X64.AppImage";
hash = "sha256-930jrjNdUE0vxuMslQNbkdm2eLAFBSsVFxlTi56a8Xg=";
hash = "sha256-us375gxVrGqGem2Et2VNRm6T389JxzPm1TScerlia9k=";
};
appimageContents = appimageTools.extract {
pkgs/by-name/de/dependabot-cli/package.nix
+6 -6
View File
@@ -12,20 +12,20 @@
}:
let
pname = "dependabot-cli";
version = "1.76.1";
version = "1.77.0";
# `tag` is what `dependabot` uses to find the relevant docker images.
tag = "nixpkgs-dependabot-cli-${version}";
# Get these hashes from
# nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag}
updateJobProxy.imageDigest = "sha256:d40c689e947e78ecdaccb3da1d070a458b7f1d1cfb3052cf5751e43583d89560";
updateJobProxy.hash = "sha256-6VhY+7pg6+LXQ1F58ghKdabqpgPcbxWI91KNz6FntJA=";
updateJobProxy.imageDigest = "sha256:53f33581efa03f1ed691b44896b231923888ba24b0e12cdc440aac2333d532c5";
updateJobProxy.hash = "sha256-GcCci6YcbZb4DgP91KpdBzwmnk5ffUJSHLtDCPyysZ4=";
# Get these hashes from
# nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag}
updaterGitHubActions.imageDigest = "sha256:e2cfbdde4014cd17cd85b9b411cb87a41d985bc27569e5fe1457ec68d16400b1";
updaterGitHubActions.hash = "sha256-VC+F0139+7n6rBLAw6MCgMf6yHCci7blaeLkHJ22fVc=";
updaterGitHubActions.imageDigest = "sha256:c58d4bebdfcaf0664ad1025e509d4b77c35ba4999b4bfad2519b2d6e0d84603d";
updaterGitHubActions.hash = "sha256-P2kcpbYKj29iW3ma808LyVwhEYlcr+4JJuvOD6fGNoc=";
in
buildGoModule {
inherit pname version;
@@ -34,7 +34,7 @@ buildGoModule {
owner = "dependabot";
repo = "cli";
rev = "v${version}";
hash = "sha256-i/Kr+69ws3HDWS+cQSn3cZzvW6GzKT+Avd3fZfvSA/c=";
hash = "sha256-Uo5QuYOEd74EiEIkf17WsjlR81x9VbOGtZcoeqegIsc=";
};
vendorHash = "sha256-dD48OKpuGAJAro7qV4tqpf/uENV2X1VQ2kUvAuJLXc0=";
pkgs/by-name/di/diffoscope/package.nix
+2 -2
View File
@@ -106,12 +106,12 @@ in
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python.pkgs.buildPythonApplication rec {
pname = "diffoscope";
version = "304";
version = "306";
pyproject = true;
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
hash = "sha256-lJdZRIyoVq1PsmiicsSxJ0Mgsy5IcAUar6l8QvJoxOw=";
hash = "sha256-Yr4xynjR5N7aImb8VVLsiUE+OoKOoneDUbw9O7b77b8=";
};
outputs = [
pkgs/by-name/fh/fheroes2/package.nix
-1
View File
@@ -42,7 +42,6 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
makeFlags = [
"FHEROES2_STRICT_COMPILATION=1"
"FHEROES2_DATA=\"${placeholder "out"}/share/fheroes2\""
];
pkgs/by-name/gi/gitfetch/package.nix
+2 -2
View File
@@ -8,14 +8,14 @@
python3Packages.buildPythonApplication rec {
pname = "gitfetch";
version = "1.2.1";
version = "1.3.2";
pyproject = true;
src = fetchFromGitHub {
owner = "Matars";
repo = "gitfetch";
tag = "v${version}";
hash = "sha256-2cOfVv/snhluazyjwDuHEbbMq3cK+bsKYnnRmby0JDo=";
hash = "sha256-HAZUdGCITr4in0K/LOSZaMHZpPjrHxcg7kAF1J0vl1I=";
};
build-system = with python3Packages; [ setuptools ];
pkgs/by-name/go/goreleaser/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
}:
buildGo125Module rec {
pname = "goreleaser";
version = "2.12.6";
version = "2.12.7";
src = fetchFromGitHub {
owner = "goreleaser";
repo = "goreleaser";
rev = "v${version}";
hash = "sha256-ZYlT/CkYMPZgVNR0uaDPbLT7WH5EDcUeTwUPFM6fZOg=";
hash = "sha256-McLE7o5eUTluIOlsArIo5Dh7fizxxCMVAdXXnSBKhQU=";
};
vendorHash = "sha256-Zv13xWe/wwmq+2lqvsX6oWIyEYlCojgIgH/cvr5rSOI=";
vendorHash = "sha256-M8+KJV7LemD6AHjJS8nZ70AZ30kZIgyYQv/yWB3lmsw=";
ldflags = [
"-s"
pkgs/by-name/hy/hyperscan/package.nix
+63 -28
View File
@@ -19,8 +19,8 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "intel";
repo = "hyperscan";
tag = "v${finalAttrs.version}";
hash = "sha256-tzmVc6kJPzkFQLUM1MttQRLpgs0uckbV6rCxEZwk1yk=";
rev = "v${finalAttrs.version}";
};
outputs = [
@@ -28,30 +28,6 @@ stdenv.mkDerivation (finalAttrs: {
"dev"
];
buildInputs = [ boost ];
nativeBuildInputs = [
cmake
ragel
python3
util-linux
pkg-config
];
cmakeFlags = [
"-DBUILD_AVX512=ON"
]
++ lib.optional (!stdenv.hostPlatform.isDarwin) "-DFAT_RUNTIME=ON"
++ lib.optional withStatic "-DBUILD_STATIC_AND_SHARED=ON"
++ lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON";
# hyperscan CMake is completely broken for chimera builds when pcre is compiled
# the only option to make it build - building from source
# In case pcre is built from source, chimera build is turned on by default
preConfigure = lib.optional withStatic ''
mkdir -p pcre
tar xvf ${pcre.src} --strip-components 1 -C pcre
'';
postPatch = ''
sed -i '/examples/d' CMakeLists.txt
substituteInPlace libhs.pc.in \
@@ -63,8 +39,67 @@ stdenv.mkDerivation (finalAttrs: {
#error Incorrect pcre version
#endif
main() {}" CORRECT_PCRE_VERSION)' 'set(CORRECT_PCRE_VERSION TRUE)'
''
# CMake 4 dropped support of versions lower than 3.5,
# versions lower than 3.10 are deprecated.
# https://github.com/NixOS/nixpkgs/issues/445447
+ ''
substituteInPlace CMakeLists.txt \
--replace-fail \
"cmake_minimum_required (VERSION 2.8.11)" \
"cmake_minimum_required (VERSION 3.10)" \
'';
buildInputs = [ boost ];
nativeBuildInputs = [
cmake
ragel
python3
util-linux
pkg-config
];
cmakeFlags = [
(lib.cmakeBool "BUILD_AVX512" true)
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
(lib.cmakeBool "FAT_RUNTIME" true)
]
++ lib.optionals withStatic [
(lib.cmakeBool "BUILD_STATIC_AND_SHARED" true)
]
++ lib.optionals (!withStatic) [
(lib.cmakeBool "BUILD_SHARED_LIBS" true)
];
# hyperscan CMake is completely broken for chimera builds when pcre is compiled
# the only option to make it build - building from source
# In case pcre is built from source, chimera build is turned on by default
preConfigure = lib.optionalString withStatic (
''
mkdir -p pcre
tar xvf ${pcre.src} --strip-components 1 -C pcre
''
# - CMake 4 dropped support of versions lower than 3.5, versions lower than 3.10 are deprecated.
# https://github.com/NixOS/nixpkgs/issues/445447
# - CMake Error at pcre/CMakeLists.txt:843 (GET_TARGET_PROPERTY):
# The LOCATION property may not be read from target "pcretest". Use the
# target name directly with add_custom_command, or use the generator
# expression $<TARGET_FILE>, as appropriate.
+ ''
substituteInPlace pcre/CMakeLists.txt \
--replace-fail \
"CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)" \
"CMAKE_MINIMUM_REQUIRED(VERSION 3.10)" \
--replace-fail \
"CMAKE_POLICY(SET CMP0026 OLD)" \
"CMAKE_POLICY(SET CMP0026 NEW)" \
--replace-fail \
"GET_TARGET_PROPERTY(PCRETEST_EXE pcretest DEBUG_LOCATION)" \
"set(PCRETEST_EXE $<TARGET_FILE:pcretest>)"
''
);
doCheck = true;
checkPhase = ''
runHook preCheck
@@ -75,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
runHook postCheck
'';
meta = with lib; {
meta = {
description = "High-performance multiple regex matching library";
longDescription = ''
Hyperscan is a high-performance multiple regex matching library.
@@ -91,11 +126,11 @@ stdenv.mkDerivation (finalAttrs: {
'';
homepage = "https://www.hyperscan.io/";
maintainers = with maintainers; [ avnik ];
maintainers = with lib.maintainers; [ avnik ];
platforms = [
"x86_64-linux"
"x86_64-darwin"
];
license = licenses.bsd3;
license = lib.licenses.bsd3;
};
})
pkgs/by-name/i3/i3a/package.nix
+10 -5
View File
@@ -6,17 +6,18 @@
python3Packages.buildPythonApplication rec {
pname = "i3a";
version = "2.1.1";
version = "2.4.0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-b1bB7Gto4aL1rbQXIelBVhutjIvZY+K+Y66BGN7OcCs=";
hash = "sha256-BcGAFFq3UEj4o7nNQ9aStueKmeDNIqSIqkYWhs2Tnqg=";
};
build-system = [
python3Packages.setuptools
python3Packages.setuptools-scm
python3Packages.hatchling
];
dependencies = [ python3Packages.i3ipc ];
@@ -25,11 +26,15 @@ python3Packages.buildPythonApplication rec {
pythonImportsCheck = [ "i3a" ];
meta = with lib; {
meta = {
changelog = "https://git.goral.net.pl/i3a.git/log/";
description = "Set of scripts used for automation of i3 and sway window manager layouts";
homepage = "https://git.goral.net.pl/i3a.git/about";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ moni ];
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [
moni
teohz
];
broken = python3Packages.python.version < "3.11";
};
}
pkgs/by-name/in/infrastructure-agent/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
}:
buildGoModule rec {
pname = "infrastructure-agent";
version = "1.70.0";
version = "1.71.0";
src = fetchFromGitHub {
owner = "newrelic";
repo = "infrastructure-agent";
rev = version;
hash = "sha256-VdBcVFDtPajmAAQe2aZONf0/pCMf98gtR9zoeqL1aKQ=";
hash = "sha256-MUutpXutrSKmKj2D1ENu00YbEkDkfrTbATQzXvaeiTo=";
};
vendorHash = "sha256-KBzckYxiQ4/nhm7ZfGQDGi5uN652oZgdc9i0UexMr24=";
pkgs/by-name/jd/jdupes/package.nix
+2 -4
View File
@@ -7,14 +7,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "jdupes";
version = "1.29.0";
version = "1.31.1";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "jbruchon";
repo = "jdupes";
rev = "v${finalAttrs.version}";
hash = "sha256-ddl1GCA96j5H6C9KTtJudQ4wSUeOGA6p4P8JPbsVr9o=";
hash = "sha256-I1DtJokp43K9nZt73od4esK705nosIWEHLw4lydufbE=";
# Unicode file names lead to different checksums on HFS+ vs. other
# filesystems because of unicode normalisation. The testdir
# directories have such files and will be removed.
@@ -29,8 +29,6 @@ stdenv.mkDerivation (finalAttrs: {
"PREFIX=${placeholder "out"}"
# don't link with ../libjodycode
"IGNORE_NEARBY_JC=1"
# link with system libjodycode (this case is erroneously missing in v1.29.0)
"LDFLAGS_EXTRA=-ljodycode"
]
++ lib.optionals stdenv.hostPlatform.isLinux [
"ENABLE_DEDUPE=1"
pkgs/by-name/ju/juledoc/package.nix
+30
View File
@@ -0,0 +1,30 @@
{
lib,
julec,
clangStdenv,
fetchFromGitHub,
}:
clangStdenv.mkDerivation (finalAttrs: {
pname = "juledoc";
version = "0.0.0-unstable-2025-09-09";
src = fetchFromGitHub {
owner = "julelang";
repo = "juledoc";
rev = "3461147f4630104999bb895bdd8e60f40ca23aaf";
hash = "sha256-0HuMWdoDoq2SgQhOnn6UnWXe2Js7/466cP2XpjvO5dw=";
};
nativeBuildInputs = [ julec.hook ];
JULE_OUT_NAME = "juledoc";
meta = {
description = "Official documentation generator for the Jule programming language";
homepage = "https://manual.jule.dev/tools/juledoc";
license = lib.licenses.bsd3;
mainProgram = "juledoc";
inherit (julec.meta) platforms maintainers;
};
})
pkgs/by-name/ju/julefmt/package.nix
+30
View File
@@ -0,0 +1,30 @@
{
lib,
julec,
clangStdenv,
fetchFromGitHub,
}:
clangStdenv.mkDerivation (finalAttrs: {
pname = "julefmt";
version = "0.0.0-unstable-2025-09-08";
src = fetchFromGitHub {
owner = "julelang";
repo = "julefmt";
rev = "cc30781206d3d7b88599cc51b3f9d7d7936de527";
hash = "sha256-g3vN2Hz4BA5c0KqIbNKHg0W77xKGZQFHUIKWjg5/UTM=";
};
nativeBuildInputs = [ julec.hook ];
JULE_OUT_NAME = "julefmt";
meta = {
description = "Official formatter tool for the Jule programming language";
homepage = "https://manual.jule.dev/tools/julefmt";
license = lib.licenses.bsd3;
mainProgram = "julefmt";
inherit (julec.meta) platforms maintainers;
};
})
pkgs/by-name/ka/kapitano/package.nix
-75
View File
@@ -1,75 +0,0 @@
{
lib,
fetchFromGitea,
meson,
ninja,
pkg-config,
glib,
gtk4,
libadwaita,
python3Packages,
clamav,
appstream-glib,
desktop-file-utils,
libxml2,
gobject-introspection,
wrapGAppsHook4,
librsvg,
}:
python3Packages.buildPythonApplication rec {
pname = "kapitano";
version = "1.1.5";
pyproject = false;
src = fetchFromGitea {
domain = "codeberg.org";
owner = "zynequ";
repo = "Kapitano";
tag = version;
hash = "sha256-eX35ZR2O56NwoFnqGNZi2lNUpoBvaYZqFh69dQ+Eng0=";
fetchLFS = true;
};
nativeBuildInputs = [
meson
ninja
desktop-file-utils
libxml2
pkg-config
appstream-glib
wrapGAppsHook4
gobject-introspection
];
buildInputs = [
glib
gtk4
libadwaita
librsvg
];
dependencies = with python3Packages; [ pygobject3 ];
postPatch = ''
substituteInPlace src/config/paths_config.py \
--replace-fail 'USER_DATA_DIR = GLib.get_user_data_dir()' 'USER_DATA_DIR = os.path.join(GLib.get_user_data_dir(), "kapitano"); os.makedirs(USER_DATA_DIR, exist_ok=True)'
'';
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=(
''${gappsWrapperArgs[@]}
--prefix PATH : "${lib.makeBinPath [ clamav ]}"
)
'';
meta = {
description = "Modern ClamAV front-end that uses gtk4/libadwaita";
homepage = "https://codeberg.org/zynequ/Kapitano";
mainProgram = "kapitano";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ lonerOrz ];
};
}
pkgs/by-name/ku/kube-router/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "kube-router";
version = "2.6.1";
version = "2.6.2";
src = fetchFromGitHub {
owner = "cloudnativelabs";
repo = "kube-router";
rev = "v${version}";
hash = "sha256-lNCp/84T9al7gfZb1PkqZxtsu3XY16b7f6IUVrFSrNQ=";
hash = "sha256-VGbjXjBhfsgIW0uIP8I8KRb4J/+4SRJBpN5ebRP40EY=";
};
vendorHash = "sha256-fXZ6jRlFdjYPV5wqSdWAMlHj1dkkEpbCtcKMuuoje1U=";
pkgs/by-name/ku/kurve/package.nix
+2 -2
View File
@@ -13,14 +13,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "kurve";
version = "2.1.0";
version = "2.2.0";
dontWrapQtApps = true;
src = fetchFromGitHub {
owner = "luisbocanegra";
repo = "kurve";
tag = "v${finalAttrs.version}";
hash = "sha256-Fm2HoD3W/MymUr3JiVxssHvxwIGQ7jri0iz+asSS1eY=";
hash = "sha256-TWNgQUgjrlzQs+cjzfoD13dHG3M93Akxyg5VNB9Rp9E=";
};
installPhase = ''
pkgs/by-name/la/ladybird/package.nix
+3 -3
View File
@@ -34,13 +34,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ladybird";
version = "0-unstable-2025-10-16";
version = "0-unstable-2025-10-28";
src = fetchFromGitHub {
owner = "LadybirdBrowser";
repo = "ladybird";
rev = "62c00712faa2cd923f18feb3c72a1348aef51145";
hash = "sha256-0sJeSCW5OkhjnQL/vKwi63xOfg63cPFN/jAVrH0Bk/A=";
rev = "d2b2d573879a50d8f3d568f9c35b8c660bc43013";
hash = "sha256-OOqAYUXjyoZHdXOaPqddeUfYD/SNCNZh6a9ysnEseLA=";
};
postPatch = ''
pkgs/by-name/la/lazysql/package.nix
+2 -2
View File
@@ -11,13 +11,13 @@
buildGoModule rec {
pname = "lazysql";
version = "0.4.2";
version = "0.4.3";
src = fetchFromGitHub {
owner = "jorgerojas26";
repo = "lazysql";
rev = "v${version}";
hash = "sha256-6tPSr28Ja7LuwWrcqSYLxxQj8e9XCgTWxzudjXOriBg=";
hash = "sha256-mab6YZPOq6DerBrHK3UQrccrM8Jtp9nu2bzUus2zLYs=";
};
vendorHash = "sha256-NGwCTEh1/5dJWOCSe18FZYYu8v7Mj6MWVEWyNNA1T68=";
pkgs/by-name/le/levmar/package.nix
+2 -2
View File
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
installPhase = ''
mkdir -p $out/include $out/lib
cp lm.h $out/include
cp levmar.h lm.h $out/include
cp liblevmar.a $out/lib
'';
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++";
homepage = "https://www.ics.forth.gr/~lourakis/levmar/";
license = lib.licenses.gpl2Plus;
maintainers = [ ];
maintainers = [ lib.maintainers.nim65s ];
platforms = lib.platforms.all;
};
})
pkgs/by-name/li/lib3mf/package.nix
+15 -5
View File
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
];
cmakeFlags = [
"-DCMAKE_INSTALL_INCLUDEDIR=include/lib3mf"
"-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include/lib3mf"
"-DUSE_INCLUDED_ZLIB=OFF"
"-DUSE_INCLUDED_LIBZIP=OFF"
"-DUSE_INCLUDED_GTEST=OFF"
@@ -95,9 +95,19 @@ stdenv.mkDerivation (finalAttrs: {
# functions are no longer in openssl, remove them from test cleanup function
substituteInPlace Tests/CPP_Bindings/Source/UnitTest_EncryptionUtils.cpp \
--replace-warn "RAND_cleanup();" "" \
--replace-warn "EVP_cleanup();" "" \
--replace-warn "CRYPTO_cleanup_all_ex_data();" ""
--replace-fail "RAND_cleanup();" "" \
--replace-fail "EVP_cleanup();" "" \
--replace-fail "CRYPTO_cleanup_all_ex_data();" ""
# Fix CMake export
# ref https://github.com/3MFConsortium/lib3mf/pull/434
substituteInPlace cmake/lib3mfConfig.cmake \
--replace-fail "$""{LIB3MF_ROOT_DIR}/include" "$""{LIB3MF_ROOT_DIR}/include/lib3mf" \
--replace-fail "$""{LIB3MF_ROOT_DIR}/lib" "$out/lib"
# Use absolute CMAKE_INSTALL_INCLUDEDIR
substituteInPlace lib3mf.pc.in \
--replace-fail "includedir=$""{prefix}/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@"
'';
doCheck = true;
@@ -109,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Reference implementation of the 3D Manufacturing Format file standard";
homepage = "https://3mf.io/";
license = licenses.bsd2;
maintainers = [ ];
maintainers = with maintainers; [ nim65s ];
platforms = platforms.all;
};
})
pkgs/by-name/li/libigl/package.nix
+1
View File
@@ -20,6 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
installPhase = ''
mkdir -p $out/include
cp -r include/igl $out/include
rm -rf $out/include/igl/opengl
'';
meta = with lib; {
pkgs/by-name/li/libjodycode/package.nix
+12 -2
View File
@@ -2,13 +2,14 @@
lib,
stdenv,
fetchFromGitea,
fetchpatch,
jdupes,
fixDarwinDylibNames,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libjodycode";
version = "4.0.1";
version = "4.1";
outputs = [
"out"
@@ -21,9 +22,18 @@ stdenv.mkDerivation (finalAttrs: {
owner = "jbruchon";
repo = "libjodycode";
rev = "v${finalAttrs.version}";
hash = "sha256-9YdDw7xIuAArQtPYhDeT4AhSwi5fhVJeBl3R+J7PaCw=";
hash = "sha256-IBOCl5iFxKwanA28JG4wEzy9tNb6TznKK8RJET8CtSY=";
};
patches = [
# Fix linux build failure, drop after 4.1 release.
(fetchpatch {
name = "linux-build-fix.patch";
url = "https://codeberg.org/jbruchon/libjodycode/commit/07294bbfd6c3c4be42c40c9ed81eebb5cd3d83a0.patch";
hash = "sha256-qgP8MgGenGebM7n5zpPJ1WTsYUTCZwcWUloUKToc1eo=";
})
];
nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
env.PREFIX = placeholder "out";
pkgs/by-name/li/libmanette/package.nix
+2 -2
View File
@@ -22,7 +22,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libmanette";
version = "0.2.12";
version = "0.2.13";
outputs = [
"out"
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/libmanette/${lib.versions.majorMinor finalAttrs.version}/libmanette-${finalAttrs.version}.tar.xz";
hash = "sha256-SLNJJnGA8dw01AWp4ekLoW8FShnOkHkw5nlJPZEeodg=";
hash = "sha256-KHzC/eDeCSkZNmr3V9heezoCSOsbOVNEcm6XlVp32K4=";
};
depsBuildBuild = lib.optionals withIntrospection [
pkgs/by-name/li/libretro-shaders-slang/package.nix
+3 -3
View File
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation {
pname = "libretro-shaders-slang";
version = "0-unstable-2025-10-20";
version = "0-unstable-2025-10-27";
src = fetchFromGitHub {
owner = "libretro";
repo = "slang-shaders";
rev = "422e59878b7e0b4d5d677e6163cc560767398d20";
hash = "sha256-PdurVN86deGS1pNvFY1IZblBklc/CEFrB7jKbB8JrG4=";
rev = "1e632419233373cc72c104467ca6f7b8229c7594";
hash = "sha256-PrSZUi2II6ppks5U4c9VTG8C72fp5ZGuI0/dqAKd9IY=";
};
dontConfigure = true;
pkgs/by-name/li/libsciter/package.nix
+21 -3
View File
@@ -10,13 +10,28 @@
autoPatchelfHook,
}:
let
inherit (stdenv.targetPlatform) system;
src.x86_64-linux = {
urlPath = "x64";
sha256 = "a1682fbf55e004f1862d6ace31b5220121d20906bdbf308d0a9237b451e4db86";
};
src.aarch64-linux = {
urlPath = "arm64";
sha256 = "sha256-bqGPbvtOM8/A6acDbFJGGf4kzKo/4S/bWcH/XvxVySU=";
};
in
stdenv.mkDerivation {
pname = "libsciter";
version = "4.4.8.23-bis"; # Version specified in GitHub commit title
src = fetchurl {
url = "https://github.com/c-smile/sciter-sdk/raw/9f1724a45f5a53c4d513b02ed01cdbdab08fa0e5/bin.lnx/x64/libsciter-gtk.so";
sha256 = "a1682fbf55e004f1862d6ace31b5220121d20906bdbf308d0a9237b451e4db86";
url = "https://github.com/c-smile/sciter-sdk/raw/524a90ef7eab16575df9496f7e4c374bbd5fb1fe/bin.lnx/${src.${system}.urlPath}/libsciter-gtk.so";
inherit (src.${system}) sha256;
};
nativeBuildInputs = [
@@ -44,7 +59,10 @@ stdenv.mkDerivation {
meta = with lib; {
homepage = "https://sciter.com";
description = "Embeddable HTML/CSS/JavaScript engine for modern UI development";
platforms = [ "x86_64-linux" ];
platforms = [
"x86_64-linux"
"aarch64-linux"
];
maintainers = with maintainers; [ leixb ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
pkgs/by-name/ll/llama-cpp/package.nix
+2 -2
View File
@@ -75,13 +75,13 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "llama-cpp";
version = "6821";
version = "6869";
src = fetchFromGitHub {
owner = "ggml-org";
repo = "llama.cpp";
tag = "b${finalAttrs.version}";
hash = "sha256-HqrX7xOYsF0UUF12c8KgIM2HMeTm1XxiFPuz/PaToI0=";
hash = "sha256-LZSeejn1IPybmfoRsOhg1YpTCFl0LrRJZyKT8ECbVjo=";
leaveDotGit = true;
postFetch = ''
git -C "$out" rev-parse --short HEAD > $out/COMMIT
pkgs/by-name/lo/lock/package.nix
+2 -2
View File
@@ -19,13 +19,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lock";
version = "1.8.0";
version = "1.8.1";
src = fetchFromGitHub {
owner = "konstantintutsch";
repo = "Lock";
tag = "v${finalAttrs.version}";
hash = "sha256-t472uLuuT5QPmfxkRP6wPalblMU68iD2wyKOxSrJfeU=";
hash = "sha256-W51V5Nz4TSN6F0/XOvn9givUIfAnI0SefooUQyj1AqM=";
};
strictDeps = true;
pkgs/by-name/lx/lxgw-neoxihei/package.nix
+2 -2
View File
@@ -6,11 +6,11 @@
stdenvNoCC.mkDerivation rec {
pname = "lxgw-neoxihei";
version = "1.225";
version = "1.226";
src = fetchurl {
url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
hash = "sha256-Mvlt9P0/tIuizXLBdzmBJpxd8UsfOwP6saYG17KVeXQ=";
hash = "sha256-rKhEnNbqQRlTepZTPM9Naau74YWRU4K22jrHYTOXKOE=";
};
dontUnpack = true;
pkgs/by-name/ma/mapcidr/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "mapcidr";
version = "1.1.96";
version = "1.1.97";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "mapcidr";
tag = "v${version}";
hash = "sha256-wEx1HDMl2y3di3k5Mb4lnX5adYYd7wPyaF2bw+5ivSY=";
hash = "sha256-a+yVSh+Cgq73mQHaumVgNqEg/gXa2r2qld4bTi3Du/Y=";
};
vendorHash = "sha256-W647ne516UVhQ3ctrr+LsAEwzxeVHBjshW1pG1Wb/gU=";
vendorHash = "sha256-4gzxKmnl8MOPcdzkwhReZ/cfbjfICY9kxousveoHYR0=";
modRoot = ".";
subPackages = [
pkgs/by-name/me/meshlab-unstable/meshlab.desktop
-14
View File
@@ -1,14 +0,0 @@
[Desktop Entry]
Name=MeshLab
Version=@version@
Name[en_GB]=MeshLab
GenericName=Mesh processing
GenericName[en_GB]=Mesh processing
Comment=View and process meshes
Type=Application
Exec=@out@/bin/meshlab %U
TryExec=@out@/bin/meshlab
Icon=@out@/share/icons/hicolor/meshlab.png
Terminal=false
MimeType=model/mesh;application/x-3ds;image/x-3ds;model/x-ply;application/sla;model/x-quad-object;model/x-geomview-off;application/x-cyclone-ptx;application/x-vmi;application/x-bre;model/vnd.collada+xml;model/openctm;application/x-expe-binary;application/x-expe-ascii;application/x-xyz;application/x-gts;chemical/x-pdb;application/x-tri;application/x-asc;model/x3d+xml;model/x3d+vrml;model/vrml;model/u3d;model/idtf;
Categories=Graphics;3DGraphics;Viewer;Qt;
pkgs/by-name/me/meshlab-unstable/package.nix
-159
View File
@@ -1,159 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
llvmPackages,
libsForQt5,
libGLU,
lib3ds,
bzip2,
muparser,
eigen,
glew,
gmp,
levmar,
qhull,
cmake,
cgal,
boost,
mpfr,
xercesc,
onetbb,
embree,
libigl,
corto,
openctm,
structuresynth,
}:
let
tinygltf-src = fetchFromGitHub {
owner = "syoyo";
repo = "tinygltf";
tag = "v2.6.3";
hash = "sha256-IyezvHzgLRyc3z8HdNsQMqDEhP+Ytw0stFNak3C8lTo=";
};
# requires submodules to build
lib3mf-src = fetchFromGitHub {
owner = "3MFConsortium";
repo = "lib3mf";
tag = "v2.3.2";
fetchSubmodules = true;
hash = "sha256-pKjnN9H6/A2zPvzpFed65J+mnNwG/dkSE2/pW7IlN58=";
};
in
stdenv.mkDerivation {
pname = "meshlab-unstable";
version = "2023.12-unstable-2025-02-21";
src = fetchFromGitHub {
owner = "cnr-isti-vclab";
repo = "meshlab";
# note that this is in branch devel
rev = "72142583980b6dbfc5b85c6cca226a72f48497a9";
hash = "sha256-ev6b8sgJsjvD8KMBbC6kbrVvTxTxpqsXu/sK1Ih6+OA=";
# needed for an updated version of vcg in their submodule
fetchSubmodules = true;
};
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace src/meshlab/CMakeLists.txt \
--replace-fail "set_additional_settings_info_plist(" "# set_additional_settings_info_plist(" \
--replace-fail " TARGET meshlab" "# TARGET meshlab" \
--replace-fail " FILE \''${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)" \
"# FILE \''${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)"
'';
buildInputs = [
libGLU
libsForQt5.qtbase
libsForQt5.qtscript
libsForQt5.qtxmlpatterns
lib3ds
bzip2
muparser
eigen
glew
gmp
levmar
qhull
cgal
boost
mpfr
xercesc
onetbb
embree
libigl
corto
openctm
structuresynth
]
++ lib.optionals stdenv.cc.isClang [
llvmPackages.openmp
];
nativeBuildInputs = [
cmake
libsForQt5.wrapQtAppsHook
];
preConfigure = ''
mkdir src/external/downloads
cp -r --no-preserve=mode,ownership ${lib3mf-src} src/external/downloads/lib3mf-2.3.2
substituteAll ${./meshlab.desktop} resources/linux/meshlab.desktop
substituteInPlace src/external/tinygltf.cmake \
--replace-fail '$'{MESHLAB_EXTERNAL_DOWNLOAD_DIR}/tinygltf-2.6.3 ${tinygltf-src}
substituteInPlace src/external/libigl.cmake \
--replace-fail '$'{MESHLAB_EXTERNAL_DOWNLOAD_DIR}/libigl-'$'{LIBIGL_VER} ${libigl}
substituteInPlace src/external/nexus.cmake \
--replace-fail '$'{NEXUS_DIR}/src/corto ${corto.src}
substituteInPlace src/external/levmar.cmake \
--replace-fail '$'{LEVMAR_LINK} ${levmar.src} \
--replace-warn "MD5 ''${LEVMAR_MD5}" ""
substituteInPlace src/external/ssynth.cmake \
--replace-fail '$'{SSYNTH_LINK} ${structuresynth.src} \
--replace-warn "MD5 ''${SSYNTH_MD5}" ""
substituteInPlace src/common_gui/CMakeLists.txt \
--replace-warn "MESHLAB_LIB_INSTALL_DIR" "CMAKE_INSTALL_LIBDIR"
'';
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/{Applications,bin,lib}
mv $out/meshlab.app $out/Applications/
ln $out/Applications/meshlab.app/Contents/Frameworks/* $out/lib/
makeWrapper $out/{Applications/meshlab.app/Contents/MacOS,bin}/meshlab
'';
postFixup =
lib.optionalString stdenv.hostPlatform.isLinux ''
patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlab-wrapped
patchelf --add-needed $out/lib/meshlab/lib3mf.so $out/lib/meshlab/plugins/libio_3mf.so
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
wrapQtApp "$out/Applications/meshlab.app/Contents/MacOS/meshlab"
install_name_tool -change libopenctm.dylib "${lib.getOutput "out" openctm}/lib/libopenctm.dylib" \
"$out/Applications/meshlab.app/Contents/PlugIns/libio_ctm.so"
'';
# The hook will wrap all the plugin binaries, make they are not a
# valid plugin. So we have to wrap the main app manually.
# See: https://github.com/NixOS/nixpkgs/pull/396295#issuecomment-3137779781
dontWrapQtApps = stdenv.hostPlatform.isDarwin;
# display a black screen on wayland, so force XWayland for now.
# Might be fixed when upstream will be ready for Qt6.
qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [
"--set QT_QPA_PLATFORM xcb"
];
meta = {
description = "System for processing and editing 3D triangular meshes (unstable)";
mainProgram = "meshlab";
homepage = "https://www.meshlab.net/";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ pca006132 ];
platforms = with lib.platforms; linux ++ darwin;
};
}
pkgs/by-name/me/meshlab/1617_cmake-use-system-dependencies-install-exports.patch
+279
View File
@@ -0,0 +1,279 @@
From 1a617220a286c23ecac1ad7bd6aca0d2c68bd1f3 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 19 Sep 2025 08:43:18 +0200
Subject: [PATCH 1/6] CMake: allow system vcglib
---
src/CMakeLists.txt | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0398e8566..839a515be 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -75,7 +75,12 @@ endif()
### Enter subdirectories
# VCGLib -- required
-if (VCGDIR) # VCGDIR exists - using custom user vcglib path
+find_package(vcglib CONFIG)
+if(TARGET vcglib::vcglib)
+ message(STATUS "- VCGLib - using system provided library")
+ add_library(vcglib ALIAS vcglib::vcglib)
+ get_target_property(VCGDIR vcglib::vcglib INTERFACE_INCLUDE_DIRECTORIES)
+elseif (VCGDIR) # VCGDIR exists - using custom user vcglib path
if(EXISTS ${VCGDIR})
add_subdirectory(${VCGDIR} {CMAKE_CURRENT_BINARY_DIR}/vcglib)
message(STATUS "- VCGLib - using custom VCGDIR path library")
From 73debae9b9ca14554c25fa58480969bc7c3f61d1 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 16 Sep 2025 12:44:12 +0200
Subject: [PATCH 2/6] CMake: MESHLAB_ALLOW_SYSTEM_LEVMAR
---
src/external/levmar.cmake | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/external/levmar.cmake b/src/external/levmar.cmake
index cc639f09e..882b631db 100644
--- a/src/external/levmar.cmake
+++ b/src/external/levmar.cmake
@@ -3,8 +3,25 @@
# SPDX-License-Identifier: BSL-1.0
option(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LEVMAR "Allow download and use of levmar source" ON)
+option(MESHLAB_ALLOW_SYSTEM_LEVMAR "Allow use of system-provided levmar" ON)
-if(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LEVMAR)
+find_path(levmar_INCLUDE_DIR NAMES levmar.h PATHS ${levmar_PREFIX})
+find_library(levmar_LIBRARY NAMES levmar PATHS ${levmar_PREFIX})
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+ levmar
+ DEFAULT_MSG
+ levmar_LIBRARY
+ levmar_INCLUDE_DIR
+)
+mark_as_advanced(levmar_INCLUDE_DIR levmar_LIBRARY)
+
+if(MESHLAB_ALLOW_SYSTEM_LEVMAR AND levmar_FOUND)
+ message(STATUS "- levmar - using system-provided library")
+ add_library(external-levmar INTERFACE)
+ target_link_libraries(external-levmar INTERFACE ${levmar_LIBRARY})
+ target_include_directories(external-levmar INTERFACE ${levmar_INCLUDE_DIR})
+elseif(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LEVMAR)
set(LEVMAR_VERSION "2.6.1")
set(LEVMAR_DIR "${MESHLAB_EXTERNAL_DOWNLOAD_DIR}/levmar-${LEVMAR_VERSION}")
From 161d5dabad4cfdc3ec08d9e5dd2ee6c94b057c5c Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 16 Sep 2025 15:15:11 +0200
Subject: [PATCH 3/6] CMake: MESHLAB_ALLOW_SYSTEM_LIB3MF
---
src/external/lib3mf.cmake | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/external/lib3mf.cmake b/src/external/lib3mf.cmake
index 1cd1b5dfa..f64a63aa5 100644
--- a/src/external/lib3mf.cmake
+++ b/src/external/lib3mf.cmake
@@ -22,8 +22,15 @@
#############################################################################
option(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LIB3MF "Allow download and use of lib3MF source" ON)
+option(MESHLAB_ALLOW_SYSTEM_LIB3MF "Allow use of system-provided lib3MF" ON)
-if(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LIB3MF)
+find_package(lib3mf)
+
+if(MESHLAB_ALLOW_SYSTEM_LIB3MF AND TARGET lib3mf::lib3mf)
+ message(STATUS "- Lib3MF - using system-provided library")
+ add_library(external-lib3mf INTERFACE)
+ target_link_libraries(external-lib3mf INTERFACE lib3mf::lib3mf)
+elseif(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LIB3MF)
set(LIB3MF_VERSION "2.4.1")
set(LIB3MF_DIR ${MESHLAB_EXTERNAL_DOWNLOAD_DIR}/lib3mf-${LIB3MF_VERSION})
From c6662d486c1f8e5c9c89389abd630d8218b0fcb9 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 16 Sep 2025 15:42:59 +0200
Subject: [PATCH 4/6] CMake: MESHLAB_ALLOW_SYSTEM_LIBIGL
---
src/external/libigl.cmake | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/external/libigl.cmake b/src/external/libigl.cmake
index 3666f375d..8f84fea4f 100644
--- a/src/external/libigl.cmake
+++ b/src/external/libigl.cmake
@@ -3,10 +3,17 @@
# SPDX-License-Identifier: BSL-1.0
option(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LIBIGL "Allow download and use of LibIGL source" ON)
+option(MESHLAB_ALLOW_SYSTEM_LIBIGL "Allow use of system-provided LibIGL" ON)
set(LIBIGL_VER 2.4.0)
-if(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LIBIGL)
+find_path(libigl_INCLUDE_DIR NAMES igl_inline.h PATH_SUFFIXES igl PATHS ${libigl_PREFIX})
+
+if(MESHLAB_ALLOW_SYSTEM_LIBIGL AND libigl_INCLUDE_DIR)
+ message(STATUS "- LibIGL - using system-provided library")
+ add_library(external-libigl INTERFACE)
+ target_include_directories(external-libigl INTERFACE ${libigl_INCLUDE_DIR})
+elseif(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LIBIGL)
set(LIBIGL_DIR "${MESHLAB_EXTERNAL_DOWNLOAD_DIR}/libigl-${LIBIGL_VER}")
set(LIBIGL_CHECK "${LIBIGL_DIR}/include/igl/igl_inline.h")
From a26427e32af672d2554d662376f3f258c64941ca Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 19 Sep 2025 08:58:16 +0200
Subject: [PATCH 5/6] CMake: MESHLAB_ALLOW_SYSTEM_NEXUS
---
src/external/nexus.cmake | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/external/nexus.cmake b/src/external/nexus.cmake
index 9fc92f714..1139d11e7 100644
--- a/src/external/nexus.cmake
+++ b/src/external/nexus.cmake
@@ -3,11 +3,18 @@
# SPDX-License-Identifier: BSL-1.0
option(MESHLAB_ALLOW_DOWNLOAD_SOURCE_NEXUS "Allow download and use of nexus source" ON)
+option(MESHLAB_ALLOW_SYSTEM_NEXUS "Allow use of system-provided nexus and corto" ON)
set(CORTO_VER 2025.07)
set(NEXUS_VER 2025.05)
-if(MESHLAB_ALLOW_DOWNLOAD_SOURCE_NEXUS)
+find_package(nexus CONFIG)
+
+if(MESHLAB_ALLOW_SYSTEM_NEXUS AND TARGET nexus::nexus)
+ message(STATUS "- nexus - using system-provided library")
+ add_library(external-nexus INTERFACE)
+ target_link_libraries(external-nexus INTERFACE nexus::nexus)
+elseif(MESHLAB_ALLOW_DOWNLOAD_SOURCE_NEXUS)
set(NEXUS_DIR "${MESHLAB_EXTERNAL_DOWNLOAD_DIR}/nexus-${NEXUS_VER}")
set(NEXUS_CHECK "${NEXUS_DIR}/CMakeLists.txt")
set(CORTO_DIR "${NEXUS_DIR}/src/corto")
From 32be737316181bd84d8beac7cb6b74379965d2fe Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 19 Sep 2025 11:26:36 +0200
Subject: [PATCH 6/6] CMake: install exports
---
src/CMakeLists.txt | 21 +++++++++++++++++++++
src/Config.cmake.in | 9 +++++++++
src/common/CMakeLists.txt | 18 ++++++++++++++----
src/meshlabplugins/io_base/CMakeLists.txt | 2 +-
4 files changed, 45 insertions(+), 5 deletions(-)
create mode 100644 src/Config.cmake.in
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 839a515be..c490ea960 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -229,6 +229,27 @@ endforeach()
set(COPIED_FILES)
if (NOT MESHLAB_BUILD_ONLY_LIBRARIES)
+ # headers
+ install(DIRECTORY common DESTINATION include FILES_MATCHING PATTERN "*.h")
+ # CMake exports
+ install(EXPORT meshlabTargets
+ DESTINATION lib/cmake/meshlab
+ NAMESPACE meshlab::
+ FILE meshlabTargets.cmake
+ )
+ include(CMakePackageConfigHelpers)
+ # generate the config file that includes the exports
+ configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
+ "${CMAKE_CURRENT_BINARY_DIR}/meshlabConfig.cmake"
+ INSTALL_DESTINATION lib/cmake/vcglib
+ NO_SET_AND_CHECK_MACRO
+ NO_CHECK_REQUIRED_COMPONENTS_MACRO
+ )
+ install(FILES
+ "${CMAKE_CURRENT_BINARY_DIR}/meshlabConfig.cmake"
+ DESTINATION lib/cmake/meshlab
+ )
+
# shaders
set(SHADER_BASE_DIR "${MESHLAB_RESOURCES_DIR}/shaders")
file(
diff --git a/src/Config.cmake.in b/src/Config.cmake.in
new file mode 100644
index 000000000..63ba0ce97
--- /dev/null
+++ b/src/Config.cmake.in
@@ -0,0 +1,9 @@
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+find_dependency(GLEW)
+find_dependency(OpenGL)
+find_dependency(Qt5 COMPONENTS OpenGL Xml Network)
+find_dependency(vcglib)
+
+include ( "${CMAKE_CURRENT_LIST_DIR}/meshlabTargets.cmake" )
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 0e640fdd4..c74bd579b 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -198,7 +198,8 @@ endif()
target_include_directories(meshlab-common
PUBLIC
- ${CMAKE_CURRENT_SOURCE_DIR}/..)
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
+ $<INSTALL_INTERFACE:include>)
target_link_libraries(
meshlab-common
@@ -208,10 +209,19 @@ target_link_libraries(
Qt5::Widgets
Qt5::Xml
Qt5::Network
- vcglib
- external-glew
+ PRIVATE
external-easyexif
)
+if(TARGET vcglib::vcglib)
+ target_link_libraries(meshlab-common PUBLIC vcglib::vcglib)
+else()
+ target_link_libraries(meshlab-common PUBLIC vcglib)
+endif()
+if(TARGET GLEW::GLEW)
+ target_link_libraries(meshlab-common PUBLIC GLEW::GLEW)
+else()
+ target_link_libraries(meshlab-common PUBLIC external-glew)
+endif()
set_property(TARGET meshlab-common PROPERTY FOLDER Core)
@@ -234,4 +244,4 @@ endif()
set_target_properties(meshlab-common PROPERTIES
INSTALL_RPATH "$ORIGIN")
-install(TARGETS meshlab-common DESTINATION ${MESHLAB_LIB_INSTALL_DIR})
+install(TARGETS meshlab-common EXPORT meshlabTargets DESTINATION ${MESHLAB_LIB_INSTALL_DIR})
diff --git a/src/meshlabplugins/io_base/CMakeLists.txt b/src/meshlabplugins/io_base/CMakeLists.txt
index 7a3137e63..64504d56d 100644
--- a/src/meshlabplugins/io_base/CMakeLists.txt
+++ b/src/meshlabplugins/io_base/CMakeLists.txt
@@ -27,4 +27,4 @@ set(SOURCES
add_meshlab_plugin(io_base ${SOURCES} ${HEADERS})
-target_link_libraries(io_base PRIVATE OpenGL::GLU)
+target_link_libraries(io_base PRIVATE OpenGL::GLU external-easyexif)
pkgs/by-name/me/meshlab/no-plist.patch
+12
View File
@@ -0,0 +1,12 @@
--- src/meshlab/CMakeLists.txt.orig 2025-10-05 23:04:12.786192073 +0200
+++ src/meshlab/CMakeLists.txt 2025-10-05 23:04:16.379256637 +0200
@@ -92,9 +92,6 @@
MACOSX_BUNDLE_COPYRIGHT "Copyright VCG-ISTI-CNR © 2005-2021. All rights reserved."
)
- set_additional_settings_info_plist(
- TARGET meshlab
- FILE ${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)
endif()
install(
pkgs/by-name/me/meshlab/package.nix
+31 -41
View File
@@ -6,6 +6,7 @@
libsForQt5,
libGLU,
lib3ds,
lib3mf,
bzip2,
muparser,
eigen,
@@ -25,16 +26,10 @@
corto,
openctm,
structuresynth,
vclab-nexus,
}:
let
tinygltf-src = fetchFromGitHub {
owner = "syoyo";
repo = "tinygltf";
tag = "v2.6.3";
hash = "sha256-IyezvHzgLRyc3z8HdNsQMqDEhP+Ytw0stFNak3C8lTo=";
};
downloads = [
"DLL_EMBREE"
"SOURCE_BOOST"
@@ -57,19 +52,18 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "meshlab";
version = "2023.12";
version = "2025.07";
src = fetchFromGitHub {
owner = "cnr-isti-vclab";
repo = "meshlab";
tag = "MeshLab-${finalAttrs.version}";
hash = "sha256-AdUAWS741RQclYaSE3Tz1/I0YSinNAnfSaqef+Tib8Y=";
hash = "sha256-6BozYzPCbBZ+btL4FCdzKlwKqTsvFWDfOXizzJSYo9s=";
};
nativeBuildInputs = [
cmake
libsForQt5.wrapQtAppsHook
vcg # templated library
];
buildInputs = [
@@ -78,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
libsForQt5.qtscript
libsForQt5.qtxmlpatterns
lib3ds
lib3mf
bzip2
muparser
eigen
@@ -91,52 +86,41 @@ stdenv.mkDerivation (finalAttrs: {
xercesc
onetbb
embree
vcg
libigl
corto
openctm
structuresynth
vclab-nexus
]
++ lib.optionals stdenv.cc.isClang [
llvmPackages.openmp
];
postPatch = ''
substituteInPlace src/external/tinygltf.cmake \
--replace-fail '$'{MESHLAB_EXTERNAL_DOWNLOAD_DIR}/tinygltf-2.6.3 ${tinygltf-src}
substituteInPlace src/external/libigl.cmake \
--replace-fail '$'{MESHLAB_EXTERNAL_DOWNLOAD_DIR}/libigl-2.4.0 ${libigl}
substituteInPlace src/external/nexus.cmake \
--replace-fail '$'{NEXUS_DIR}/src/corto ${corto.src}
substituteInPlace src/external/levmar.cmake \
--replace-fail '$'{LEVMAR_LINK} ${levmar.src} \
--replace-warn "MD5 ''${LEVMAR_MD5}" ""
substituteInPlace src/external/ssynth.cmake \
--replace-fail '$'{SSYNTH_LINK} ${structuresynth.src} \
--replace-warn "MD5 ''${SSYNTH_MD5}" ""
substituteInPlace src/common_gui/CMakeLists.txt \
--replace-warn "MESHLAB_LIB_INSTALL_DIR" "CMAKE_INSTALL_LIBDIR"
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
patches = [
# CMake: use system dependencies, install exports
# ref. https://github.com/cnr-isti-vclab/meshlab/pull/1617
# merged upstream
./1617_cmake-use-system-dependencies-install-exports.patch
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
./no-plist.patch
];
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
substituteAll ${./meshlab.desktop} resources/linux/meshlab.desktop
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace src/meshlab/CMakeLists.txt \
--replace-fail "set_additional_settings_info_plist(" "# set_additional_settings_info_plist(" \
--replace-fail " TARGET meshlab" "# TARGET meshlab" \
--replace-fail " FILE \''${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)" \
"# FILE \''${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)"
'';
cmakeFlags = [
"-DVCGDIR=${vcg.src}"
]
++ cmakeFlagsDisallowDownload;
cmakeFlags = cmakeFlagsDisallowDownload;
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/{Applications,bin,lib}
mv $out/meshlab.app $out/Applications/
ln $out/Applications/meshlab.app/Contents/Frameworks/libmeshlab-common.dylib $out/lib/
ln $out/Applications/meshlab.app/Contents/Frameworks/libmeshlab-common{,-gui}.dylib $out/lib/
makeWrapper $out/{Applications/meshlab.app/Contents/MacOS,bin}/meshlab
substituteInPlace $out/lib/cmake/meshlab/meshlabTargets-release.cmake --replace-fail \
"{_IMPORT_PREFIX}/meshlab.app" \
"{_IMPORT_PREFIX}/Applications/meshlab.app"
'';
# The hook will wrap all the plugin binaries, make they are not a
@@ -150,7 +134,10 @@ stdenv.mkDerivation (finalAttrs: {
postFixup =
lib.optionalString stdenv.hostPlatform.isLinux ''
patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlab-wrapped
patchelf \
--add-needed $out/lib/meshlab/libmeshlab-common.so \
--add-needed $out/lib/meshlab/libmeshlab-common-gui.so \
$out/bin/.meshlab-wrapped
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
wrapQtApp "$out/Applications/meshlab.app/Contents/MacOS/meshlab"
@@ -163,7 +150,10 @@ stdenv.mkDerivation (finalAttrs: {
mainProgram = "meshlab";
homepage = "https://www.meshlab.net/";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ yzx9 ];
maintainers = with lib.maintainers; [
nim65s
yzx9
];
platforms = with lib.platforms; linux ++ darwin;
};
})
pkgs/by-name/mm/mmseqs2/package.nix
+16 -15
View File
@@ -16,12 +16,12 @@
llvmPackages,
zlib,
bzip2,
pkgsStatic,
zstd,
runCommand,
}:
}@args:
let
# require static library, libzstd.a
inherit (pkgsStatic) zstd;
zstd = args.zstd.override { enableStatic = true; };
in
stdenv.mkDerivation (finalAttrs: {
@@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
xxd
perl
installShellFiles
zstd
]
++ lib.optionals cudaSupport [
cudaPackages.cuda_nvcc
@@ -58,17 +57,19 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
];
buildInputs =
lib.optionals stdenv.cc.isClang [
llvmPackages.openmp
zlib
bzip2
]
++ lib.optional enableMpi mpi
++ lib.optionals cudaSupport [
cudaPackages.cuda_cudart
cudaPackages.cuda_cccl
];
buildInputs = [
zstd
]
++ lib.optionals stdenv.cc.isClang [
llvmPackages.openmp
zlib
bzip2
]
++ lib.optional enableMpi mpi
++ lib.optionals cudaSupport [
cudaPackages.cuda_cudart
cudaPackages.cuda_cccl
];
postInstall = ''
installShellCompletion --bash --cmd mmseqs $out/util/bash-completion.sh
pkgs/by-name/mt/mtail/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "mtail";
version = "3.2.21";
version = "3.2.22";
src = fetchFromGitHub {
owner = "jaqx0r";
repo = "mtail";
rev = "v${version}";
hash = "sha256-i5c9e7b7PmvFdNddngsCIx4GKYqPPwTZSUoNAIL8RZ4=";
hash = "sha256-Cy5eXv1ccLdCZJUR0Qk0O+YMW5K+yYOeJ0B0dgvTCWo=";
};
vendorHash = "sha256-hVguLf/EkTz7Z8lTT9tCQ8iGO5asSkrsW+u8D1ND+dw=";
vendorHash = "sha256-CABKXYhW6wxac/VNqmm+3tHR0MtjpN7ZGNTiZhlgrHM=";
nativeBuildInputs = [
gotools # goyacc
pkgs/by-name/mu/multipath-tools/package.nix
+2 -2
View File
@@ -22,13 +22,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "multipath-tools";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "opensvc";
repo = "multipath-tools";
tag = finalAttrs.version;
hash = "sha256-Jeiy1bM7vuy2+r/0W1nAhgsncyV6QHdlV55aepAxHAg=";
hash = "sha256-FlmcZNi19ajAVTwHSNgS5jEsHUk8vHyzuFfxgN+WSxQ=";
};
nativeBuildInputs = [
pkgs/by-name/no/nootka/package.nix
+5
View File
@@ -45,6 +45,11 @@ stdenv.mkDerivation (finalAttrs: {
"-DENABLE_PULSEAUDIO=ON"
];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 3.1.0)" "cmake_minimum_required(VERSION 3.10)"
'';
meta = {
description = "Application for practicing playing musical scores and ear training";
mainProgram = "nootka";
pkgs/by-name/no/notcurses/package.nix
+2 -2
View File
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "notcurses";
version = "3.0.16";
version = "3.0.17";
src = fetchFromGitHub {
owner = "dankamongmen";
repo = "notcurses";
rev = "v${version}";
sha256 = "sha256-qAc9jKFpYgI0SdzKHhzmrPkWg4uSXDetD/oNEmHob2o=";
sha256 = "sha256-HbyQmuxwfEWlSe/y6w0ZRui0NCFYb0SJh7YA6PC3jdY=";
};
outputs = [
pkgs/by-name/oc/octoscan/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "octoscan";
version = "0.1.5";
version = "0.1.6";
src = fetchFromGitHub {
owner = "synacktiv";
repo = "octoscan";
tag = "v${version}";
hash = "sha256-SG6QHpDG9kPfb9jvHwz58U7+HZpFwYzwsDERNRW5R10=";
hash = "sha256-BFq4PXW5V8L4NP6wn2t2hG5xBKwxlgS+YC75VDTKKjs=";
};
vendorHash = "sha256-Jx4OEVqCTiW/BSygeLtwwqijiACEuPk0BT26JQoL3Ds=";
vendorHash = "sha256-+TQDZXqWNBFAPES0qsrpBdl/jQZAfHXBcav2HcS0d7o=";
ldflags = [
"-s"
pkgs/by-name/ol/olivetin/package.nix
+2 -2
View File
@@ -86,13 +86,13 @@ buildGoModule (
{
pname = "olivetin";
version = "2025.10.24";
version = "2025.10.27";
src = fetchFromGitHub {
owner = "OliveTin";
repo = "OliveTin";
tag = finalAttrs.version;
hash = "sha256-JarySndKRjyY2zu8QAntx9xr4vnK7/fp/zz5ibOB+ok=";
hash = "sha256-iMfdOB2g1bNhkTaxuV9wUbslVmlKs+Ha5LL67IRgZm8=";
};
modRoot = "service";
pkgs/by-name/op/opengamepadui/package.nix
+2 -2
View File
@@ -23,7 +23,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "opengamepadui";
version = "0.42.0";
version = "0.42.1";
buildType = if withDebug then "debug" else "release";
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ShadowBlip";
repo = "OpenGamepadUI";
tag = "v${finalAttrs.version}";
hash = "sha256-8+ZPvu4Gen7P8uKLrPXNaSqkdrUxz9K/naZxy/WoCik=";
hash = "sha256-v+nLluz3Zxvcvx491NxMx+obwfdRJycGLyBAhviRktU=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
pkgs/by-name/op/openscad-unstable/package.nix
+7
View File
@@ -57,6 +57,13 @@ clangStdenv.mkDerivation rec {
patches = [ ./test.diff ];
# fix use of our lib3mf cmake export instead of finder
postPatch = ''
substituteInPlace CMakeLists.txt --replace-fail \
"Lib3MF" \
"lib3mf"
'';
nativeBuildInputs = [
(python3.withPackages (
ps: with ps; [
pkgs/by-name/op/openscad/package.nix
+14
View File
@@ -84,6 +84,15 @@ stdenv.mkDerivation rec {
sed -i 's/& / \&/g;s/\*\*/\0 /g;s/^\(.\) /\1\t/' "$out"
'';
})
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# ref. https://github.com/openscad/openscad/pull/4013 merged upstream
(fetchpatch {
name = "mem_fun-to-mem_fn.patch";
url = "https://github.com/openscad/openscad/commit/c9a1abbedfbf6dda9a23d3ad5844d11e5278a928.patch";
hash = "sha256-Man9ledRREb7U+2UOQ0VkpiwbYQjyVOY21YaRFObZc8=";
})
];
postPatch = ''
@@ -92,6 +101,11 @@ stdenv.mkDerivation rec {
substituteInPlace src/openscad.cc \
--replace-fail 'boost::join' 'boost::algorithm::join'
''
# ref. https://github.com/openscad/openscad/pull/4253 merged upstream but does not apply
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace src/FreetypeRenderer.h \
--replace-fail ": public std::unary_function<const GlyphData *, void>" ""
'';
nativeBuildInputs = [
pkgs/by-name/ov/ov/package.nix
+3 -3
View File
@@ -12,16 +12,16 @@
buildGoModule rec {
pname = "ov";
version = "0.44.0";
version = "0.45.1";
src = fetchFromGitHub {
owner = "noborus";
repo = "ov";
tag = "v${version}";
hash = "sha256-GsOxN+Ya90PeGdICbghj/eFJK7gOLAG/Bk0/zoStxgQ=";
hash = "sha256-Ptzlz+9mBKSPmogT4PVnimHw/wsQMQpfPo8MX1AocdM=";
};
vendorHash = "sha256-faJjRFtnl7KdCAe+nFE793+cejQggauhJtvKdt9IRvY=";
vendorHash = "sha256-iAwlD6G+80Ci9pGANqbcmVjoRto7FMBSSDKsI6lpv/k=";
ldflags = [
"-s"
pkgs/by-name/p3/p3x-onenote/package.nix
+2 -2
View File
@@ -20,8 +20,8 @@ let
hash =
{
aarch64-linux = "sha256-FB6+0Ze3d/6QETgtMtc6GztnPdSy5s7k67qsAtFdsyM=";
armv7l-linux = "sha256-Q45tfcGrNjd9wXt+VhXhaHrC4w68lRUIuB4cJSW5NDE=";
aarch64-linux = "sha256-6R+QzCeochojB1zo8SWiIVszrjbII+H2R/TReCsPip4=";
armv7l-linux = "sha256-jhrPixz/ZHJRIe+xtmBRtDJFL7LqZqcoK7rdGrsoySo=";
x86_64-linux = "sha256-sDzwEhoPEfa21zBwD0IYoRdz4VHeTSUL0biHbbWE+Dc=";
}
.${stdenv.hostPlatform.system};
pkgs/by-name/pk/pkgsite/package.nix
+3 -3
View File
@@ -7,13 +7,13 @@
buildGoModule {
pname = "pkgsite";
version = "0-unstable-2025-10-09";
version = "0-unstable-2025-10-24";
src = fetchFromGitHub {
owner = "golang";
repo = "pkgsite";
rev = "31e4cbb15040258abb9a4e5eb0d5fcef6f8e0562";
hash = "sha256-JCcutMJNeeqN7ruTwrvAIe44Xpi7Ne9UXVPnQW5ujEk=";
rev = "4bd6c634f204f1469ab5130fc5b65eb843e98aac";
hash = "sha256-zKgx7nQgmQyyHEobTlu92FMGPn3DABAA9KwkBaIjRsQ=";
};
vendorHash = "sha256-EbZ+38LLnp5aefiuBAOFHA3uPPUmPGLsDIEMln5Vh7c=";
pkgs/by-name/po/portmidi/missing-header.diff
-12
View File
@@ -1,12 +0,0 @@
diff --git a/porttime/ptmacosx_mach.c b/porttime/ptmacosx_mach.c
index 10c3554..712a974 100755
--- a/porttime/ptmacosx_mach.c
+++ b/porttime/ptmacosx_mach.c
@@ -12,6 +12,7 @@
#include "porttime.h"
#include "sys/time.h"
+#include "sys/qos.h"
#include "pthread.h"
#ifndef NSEC_PER_MSEC
pkgs/by-name/po/portmidi/package.nix
+2 -7
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "portmidi";
version = "2.0.6";
version = "2.0.7";
src = fetchFromGitHub {
owner = "portmidi";
repo = "portmidi";
rev = "v${version}";
sha256 = "sha256-ou+zN4XnR+QaWC/hzgtThVbeZ/3UVLTpZ9O+eQSGVBs=";
sha256 = "sha256-kmyjOsjLG56Qqrf6DqgOTpt4A4aCMvCI3koiUoKzwrE=";
};
cmakeFlags = [
@@ -24,11 +24,6 @@ stdenv.mkDerivation rec {
"-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=Release"
];
patches = [
# Add missing header include
./missing-header.diff
];
postInstall =
let
ext = stdenv.hostPlatform.extensions.sharedLibrary;
pkgs/by-name/pr/proton-ge-bin/package.nix
+2 -2
View File
@@ -9,11 +9,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "proton-ge-bin";
version = "GE-Proton10-21";
version = "GE-Proton10-23";
src = fetchzip {
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
hash = "sha256-Oa9+DjEeZZiJEr9H7wnUtGb6v/JXHk0qt0GAGcp3JFQ=";
hash = "sha256-cOjrP9Nh4cPcX3uwYF25z2QHnNDNb83FPa4O0zdENeg=";
};
dontUnpack = true;
pkgs/by-name/qa/qalculate-qt/package.nix
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qalculate-qt";
version = "5.8.0";
version = "5.8.1";
src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-qt";
tag = "v${finalAttrs.version}";
hash = "sha256-tVIKvpH43fmKZ7ezTwgeQ1T9yEx2sOne49oNo6Ti2lw=";
hash = "sha256-xrhN/xacQJ2WdrM330YadZjvnmB2T7uZvFSAWA5GO2w=";
};
nativeBuildInputs = with qt6; [
pkgs/by-name/qm/qmidinet/package.nix
+8 -6
View File
@@ -2,33 +2,35 @@
stdenv,
lib,
fetchurl,
cmake,
pkg-config,
alsa-lib,
libjack2,
libsForQt5,
qt6,
}:
stdenv.mkDerivation (finalAttrs: {
version = "0.9.4";
version = "1.0.1";
pname = "qmidinet";
src = fetchurl {
url = "mirror://sourceforge/qmidinet/qmidinet-${finalAttrs.version}.tar.gz";
sha256 = "sha256-7Ui4kUgYgpPVAaaINrd6WGZoYon5UuHszGVaHafb/p0=";
hash = "sha256-9V1KXK6LAYxM+kei14pof93hZQUDs7/ywRaSz6pwyyk=";
};
hardeningDisable = [ "format" ];
buildInputs = [
libsForQt5.qtbase
libsForQt5.qttools
qt6.qtbase
qt6.qttools
alsa-lib
libjack2
];
nativeBuildInputs = [
cmake
pkg-config
libsForQt5.wrapQtAppsHook
qt6.wrapQtAppsHook
];
meta = {
pkgs/by-name/ra/racket/package.nix
+11
View File
@@ -87,8 +87,19 @@ minimal.overrideAttrs (
export XDG_CACHE_HOME=$(mktemp -d)
'';
dontWrapGApps = true;
preFixup = lib.optionalString (!isDarwin) ''
gappsWrapperArgs+=("--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive")
find $out/bin -type f -executable -print0 |
while IFS= read -r -d ''' f; do
if test "$(file --brief --mime-type "$f")" = application/x-executable; then
wrapGApp "$f"
fi
done
wrapGApp $out/lib/racket/gracket
'';
passthru =
pkgs/by-name/ra/radicle-job/package.nix
+3 -13
View File
@@ -2,7 +2,6 @@
lib,
rustPlatform,
fetchFromRadicle,
fetchRadiclePatch,
radicle-node,
gitMinimal,
versionCheckHook,
@@ -10,25 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "radicle-job";
version = "0.3.0";
version = "0.4.0";
src = fetchFromRadicle {
seed = "iris.radicle.xyz";
repo = "z2UcCU1LgMshWvXj6hXSDDrwB8q8M";
tag = "releases/v${finalAttrs.version}";
hash = "sha256-6UrkKyIdSM5lSYNF/A3xIf3FGiM2pB/5s7F49jtn0KE=";
hash = "sha256-EGNs0IOJSp5SMJ3tdGCxIAN6hvVFwWWUmXoB914jw3k=";
};
patches = [
# https://app.radicle.xyz/nodes/rosa.radicle.xyz/rad:z2UcCU1LgMshWvXj6hXSDDrwB8q8M/patches/dac4fef89d07fe609dd5d3d75ea57f76f1cca3dc
(fetchRadiclePatch {
inherit (finalAttrs.src) seed repo;
revision = "dac4fef89d07fe609dd5d3d75ea57f76f1cca3dc";
hash = "sha256-oFUkiBIqAa/DWqlTZw0LzHbgK/uhWik8qbRcGcGpkDY=";
})
];
cargoHash = "sha256-5GjLqs4ol7lUE96KwtE7W3lxL9H/A/0yDpiMDiLQDeY=";
cargoHash = "sha256-+DD2cGfxN0rmFhCazEuRiv3JfLXIC4FjaYHmugCmk+g=";
nativeCheckInputs = [
radicle-node
pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
+3 -3
View File
@@ -12,15 +12,15 @@
rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped";
version = "2025-08-25";
version = "2025-10-27";
cargoHash = "sha256-G1R3IiKbQg1Dl6OFJSto0w4c18OUIrAPRiM/YStfkl0=";
cargoHash = "sha256-iw+Pgtv5VkCRSa07ap5fjhVZQgo+sfNjp5A4yaHdX1M=";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-analyzer";
rev = version;
hash = "sha256-apbJj2tsJkL2l+7Or9tJm1Mt5QPB6w/zIyDkCx8pfvk=";
hash = "sha256-syeBTCCU96qPJHcVpwHeCwmPCiLTDHHgYQYhpZ0iwLo=";
};
cargoBuildFlags = [

Some files were not shown because too many files have changed in this diff Show More