From 5d5f6bf693cd34617e8935aecf1d23cae564cab4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Sep 2024 15:49:32 +0000 Subject: [PATCH 01/27] python312Packages.pysmb: 1.2.9.1 -> 1.2.10 --- pkgs/development/python-modules/pysmb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix index 5a2733c30205..69023a4db8e5 100644 --- a/pkgs/development/python-modules/pysmb/default.nix +++ b/pkgs/development/python-modules/pysmb/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysmb"; - version = "1.2.9.1"; + version = "1.2.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "miketeo"; repo = "pysmb"; rev = "refs/tags/pysmb-${version}"; - hash = "sha256-psV6fYymE6k2YqxOvFM2s7JTG51fI5pSqmkZnvfmprw="; + hash = "sha256-Zid6KGNr7BBuyHaxdXkhRC/Ug93HmVXKMtreFf+M7OE="; }; propagatedBuildInputs = [ From 70a662d45b8d21a080a486a29db5665eaf1af8e4 Mon Sep 17 00:00:00 2001 From: Samuel Rounce Date: Sat, 21 Sep 2024 22:44:46 +0100 Subject: [PATCH 02/27] =?UTF-8?q?freecad:=200.21.2=20=E2=86=92=201.0rc1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0001-NIXOS-don-t-ignore-PYTHONPATH.patch | 57 +++++++++---------- .../0002-FreeCad-OndselSolver-pkgconfig.patch | 7 +++ pkgs/by-name/fr/freecad/package.nix | 20 +++++-- 3 files changed, 49 insertions(+), 35 deletions(-) create mode 100644 pkgs/by-name/fr/freecad/0002-FreeCad-OndselSolver-pkgconfig.patch diff --git a/pkgs/by-name/fr/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch b/pkgs/by-name/fr/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch index 27e5fb81b8d0..185d6effa25e 100644 --- a/pkgs/by-name/fr/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch +++ b/pkgs/by-name/fr/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch @@ -1,44 +1,43 @@ -From c4f452ef6ae083ed21095313582f6d1bd775cbf3 Mon Sep 17 00:00:00 2001 -From: Andreas Rammhold -Date: Thu, 2 Nov 2023 17:32:07 +0100 -Subject: [PATCH] NIXOS: don't ignore PYTHONPATH +commit c534a831c2f7186ebabe4e17f1e1df6d11ebff89 +Author: Samuel Rounce +Date: Thu Sep 5 22:17:21 2024 +0100 -On NixOS or rather within nixpkgs we provide the runtime Python -packages via the PYTHONPATH environment variable. FreeCAD tries its -best to ignore Python environment variables that are being inherited -from the environment. For Python versions >=3.11 it also tries to -initialize the interpreter config without any environmental data. We -have to initialize the configuration *with* the information from the -environment for our packaging to work. - -Upstream has purposely isolated the environments AFAIK and thus -shouldn't accept this patch (as is). What they might accept (once -support for older Python versions has been dropped) is removing the -PYTHONPATH specific putenv calls. + [PATCH] NIXOS: don't ignore PYTHONPATH + + On NixOS or rather within nixpkgs we provide the runtime Python + packages via the PYTHONPATH environment variable. FreeCAD tries its + best to ignore Python environment variables that are being inherited + from the environment. For Python versions >=3.11 it also tries to + initialize the interpreter config without any environmental data. We + have to initialize the configuration *with* the information from the + environment for our packaging to work. + + Upstream has purposely isolated the environments AFAIK and thus + shouldn't accept this patch (as is). What they might accept (once + support for older Python versions has been dropped) is removing the + PYTHONPATH specific putenv calls. --- - src/Base/Interpreter.cpp | 2 +- + src/Base/Interpreter.cpp | 1 + src/Main/MainGui.cpp | 3 --- - 2 files changed, 1 insertion(+), 4 deletions(-) + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Base/Interpreter.cpp b/src/Base/Interpreter.cpp -index 52c47168af..9966bd0013 100644 +index 2bdc54ccff..ee4f7fc070 100644 --- a/src/Base/Interpreter.cpp +++ b/src/Base/Interpreter.cpp -@@ -554,7 +554,9 @@ void initInterpreter(int argc,char *argv[]) - { - PyStatus status; +@@ -593,6 +593,7 @@ void initInterpreter(int argc, char* argv[]) PyConfig config; PyConfig_InitIsolatedConfig(&config); -+ config.isolated = 0; + config.isolated = 0; + config.use_environment = 1; + config.user_site_directory = 1; status = PyConfig_SetBytesArgv(&config, argc, argv); - if (PyStatus_Exception(status)) { diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp -index 48ae847ef4..28813df383 100644 +index 36087cffd6..89d49d2cc6 100644 --- a/src/Main/MainGui.cpp +++ b/src/Main/MainGui.cpp -@@ -112,17 +112,14 @@ int main( int argc, char ** argv ) +@@ -114,10 +114,8 @@ int main(int argc, char** argv) // See https://forum.freecad.org/viewtopic.php?f=18&t=20600 // See Gui::Application::runApplication() putenv("LC_NUMERIC=C"); @@ -49,13 +48,11 @@ index 48ae847ef4..28813df383 100644 #elif defined(__MINGW32__) const char* mingw_prefix = getenv("MINGW_PREFIX"); const char* py_home = getenv("PYTHONHOME"); - if (!py_home && mingw_prefix) +@@ -125,7 +123,6 @@ int main(int argc, char** argv) _putenv_s("PYTHONHOME", mingw_prefix); + } #else - _putenv("PYTHONPATH="); // https://forum.freecad.org/viewtopic.php?f=4&t=18288 // https://forum.freecad.org/viewtopic.php?f=3&t=20515 const char* fc_py_home = getenv("FC_PYTHONHOME"); --- -2.42.0 - diff --git a/pkgs/by-name/fr/freecad/0002-FreeCad-OndselSolver-pkgconfig.patch b/pkgs/by-name/fr/freecad/0002-FreeCad-OndselSolver-pkgconfig.patch new file mode 100644 index 000000000000..194220ec6e14 --- /dev/null +++ b/pkgs/by-name/fr/freecad/0002-FreeCad-OndselSolver-pkgconfig.patch @@ -0,0 +1,7 @@ +--- a/src/3rdParty/OndselSolver/OndselSolver.pc.in ++++ b/src/3rdParty/OndselSolver/OndselSolver.pc.in +@@ -3,2 +3,2 @@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_LIBDIR@ ++includedir=@CMAKE_INSTALL_INCLUDEDIR@ diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix index fda823b66744..03d38273de28 100644 --- a/pkgs/by-name/fr/freecad/package.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -9,12 +9,12 @@ , gfortran , gts , hdf5 -, libGLU -, libXmu , libf2c +, libGLU , libredwg , libsForQt5 , libspnav +, libXmu , medfile , mpi , ninja @@ -29,6 +29,7 @@ , vtk , wrapGAppsHook3 , xercesc +, yaml-cpp , zlib , withWayland ? false }: @@ -50,6 +51,7 @@ let matplotlib pivy ply + pybind11 pycollada pyside2 pyside2-tools @@ -61,13 +63,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "freecad"; - version = "0.21.2"; + version = "1.0rc1"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; rev = finalAttrs.version; - hash = "sha256-OX4s9rbGsAhH7tLJkUJYyq2A2vCdkq/73iqYo9adogs="; + hash = "sha256-CQWLYGgcz/up1SVc2V7nOX0deGBSEEs2RwbA7pr5kc4="; + fetchSubmodules = true; }; nativeBuildInputs = [ @@ -100,6 +103,7 @@ stdenv.mkDerivation (finalAttrs: { opencascade-occt pivy ply # for openSCAD file support + pybind11 pycollada pyside2 pyside2-tools @@ -116,6 +120,7 @@ stdenv.mkDerivation (finalAttrs: { swig vtk xercesc + yaml-cpp zlib ] ++ lib.optionals spaceNavSupport [ @@ -125,12 +130,17 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch + ./0002-FreeCad-OndselSolver-pkgconfig.patch ]; cmakeFlags = [ "-Wno-dev" # turns off warnings which otherwise makes it hard to see what is going on "-DBUILD_FLAT_MESH:BOOL=ON" "-DBUILD_QT5=ON" + "-DBUILD_DRAWING=ON" + "-DBUILD_FLAT_MESH:BOOL=ON" + "-DINSTALL_TO_SITEPACKAGES=OFF" + "-DFREECAD_USE_PYBIND11=ON" "-DSHIBOKEN_INCLUDE_DIR=${shiboken2}/include" "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken" ( @@ -201,7 +211,7 @@ stdenv.mkDerivation (finalAttrs: { right at home with FreeCAD. ''; license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ gebner AndersonTorres ]; + maintainers = with lib.maintainers; [ gebner AndersonTorres srounce ]; platforms = lib.platforms.linux; }; }) From 935e1d72db7458183ca4936a128f4ae947ae9a9a Mon Sep 17 00:00:00 2001 From: Samuel Rounce Date: Fri, 27 Sep 2024 03:43:12 +0100 Subject: [PATCH 03/27] =?UTF-8?q?freecad:=201.0rc1=20=E2=86=92=201.0rc2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/fr/freecad/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix index 03d38273de28..adb558c7e406 100644 --- a/pkgs/by-name/fr/freecad/package.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -63,13 +63,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "freecad"; - version = "1.0rc1"; + version = "1.0rc2"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; rev = finalAttrs.version; - hash = "sha256-CQWLYGgcz/up1SVc2V7nOX0deGBSEEs2RwbA7pr5kc4="; + hash = "sha256-kPmfx/C1fCYwBqh6ZOKZAVNVR9m3VryPmBKu3ksDD5E="; fetchSubmodules = true; }; From 01525c4d9795e4f036f296163fe3aed834c91b6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 06:11:15 +0000 Subject: [PATCH 04/27] outline: 0.79.0 -> 0.80.2 --- pkgs/servers/web-apps/outline/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index 872a87674793..721df17cf193 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "outline"; - version = "0.79.0"; + version = "0.80.2"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${version}"; - hash = "sha256-uu0HlQ3LaVBjSharROKv+mS8/qONV5qND/5kMTsaGeQ="; + hash = "sha256-kmi6H2vdzg7ftUOrzs2b5e9n1bSFHiQ0wk6Q6T/lDdk="; }; nativeBuildInputs = [ makeWrapper prefetch-yarn-deps fixup-yarn-lock ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-S2vKYVIFsSlPqFbpLhBH9S43Invo3hsNLvfLX98922Y="; + hash = "sha256-Ibgn/J2OCP2F0hbPQi35uGAOfoZ2D5HD/E85oOTr6G0="; }; configurePhase = '' From 8bab23b22dc269b32713690718ff2e92d22fa3b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Sep 2024 14:32:51 +0000 Subject: [PATCH 05/27] simplex-chat-desktop: 6.0.4 -> 6.0.5 --- pkgs/by-name/si/simplex-chat-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index f022aa0142c1..38df48bb1704 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -6,11 +6,11 @@ let pname = "simplex-chat-desktop"; - version = "6.0.4"; + version = "6.0.5"; src = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-yDymJ44NIqDg5++WV5rcbOAR4gEWZpwNDClJkFMe9Ns="; + hash = "sha256-z40Udd3+GWd4JSVNsqwFUm3GcbfNre+lFR/UP1+msyo="; }; appimageContents = appimageTools.extract { From 25f4610b3eec8f2dd61f653c734f64ca96e1b828 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 29 Sep 2024 14:02:33 +0900 Subject: [PATCH 06/27] python312Packages.pysmb: switch to pypa builder --- pkgs/development/python-modules/pysmb/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix index 69023a4db8e5..d58336d0019c 100644 --- a/pkgs/development/python-modules/pysmb/default.nix +++ b/pkgs/development/python-modules/pysmb/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pyasn1, pythonOlder, tqdm, @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "pysmb"; version = "1.2.10"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +22,9 @@ buildPythonPackage rec { hash = "sha256-Zid6KGNr7BBuyHaxdXkhRC/Ug93HmVXKMtreFf+M7OE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pyasn1 tqdm ]; From ca6795545c1682a2e12bf12dea0216ce6b77239a Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 29 Sep 2024 10:17:01 +0300 Subject: [PATCH 07/27] gmt: modernize Nixfmt; Use `finalAttrs:` pattern; don't use `with lib;` in meta; Switch to fetchFromGitHub, for better automatic updates, with hash instead of sha256. --- pkgs/applications/gis/gmt/default.nix | 130 +++++++++++++++++--------- 1 file changed, 84 insertions(+), 46 deletions(-) diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix index 092d1cb431d6..ec70ab02b1da 100644 --- a/pkgs/applications/gis/gmt/default.nix +++ b/pkgs/applications/gis/gmt/default.nix @@ -1,59 +1,97 @@ -{ lib, stdenv, fetchurl, cmake, curl, Accelerate, CoreGraphics, CoreVideo -, fftwSinglePrec, netcdf, pcre, gdal, blas, lapack, glibc, ghostscript, dcw-gmt -, gshhg-gmt }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + curl, + Accelerate, + CoreGraphics, + CoreVideo, + fftwSinglePrec, + netcdf, + pcre, + gdal, + blas, + lapack, + glibc, + ghostscript, + dcw-gmt, + gshhg-gmt, +}: -/* The onus is on the user to also install: - - ffmpeg for webm or mp4 output - - graphicsmagick for gif output +/* + The onus is on the user to also install: + - ffmpeg for webm or mp4 output + - graphicsmagick for gif output */ -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gmt"; version = "6.4.0"; - src = fetchurl { - url = "https://github.com/GenericMappingTools/gmt/releases/download/${version}/gmt-${version}-src.tar.gz"; - sha256 = "sha256-0mfAx9b7MMnqfgKe8n2tsm/9e5LLS0cD+aO6Do85Ohs="; + src = fetchFromGitHub { + owner = "GenericMappingTools"; + repo = "gmt"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-rRNEo7dGkmgrkhNCBacyfBYrl7zHnE0KMWQHT0Ekbo0="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; - buildInputs = [ curl gdal netcdf pcre dcw-gmt gshhg-gmt ] - ++ (if stdenv.hostPlatform.isDarwin then [ - Accelerate - CoreGraphics - CoreVideo - ] else [ - glibc - fftwSinglePrec - blas - lapack - ]); + buildInputs = + [ + curl + gdal + netcdf + pcre + dcw-gmt + gshhg-gmt + ] + ++ ( + if stdenv.hostPlatform.isDarwin then + [ + Accelerate + CoreGraphics + CoreVideo + ] + else + [ + glibc + fftwSinglePrec + blas + lapack + ] + ); - propagatedBuildInputs = [ ghostscript ]; + propagatedBuildInputs = [ + ghostscript + ]; - cmakeFlags = [ - "-DGMT_DOCDIR=share/doc/gmt" - "-DGMT_MANDIR=share/man" - "-DGMT_LIBDIR=lib" - "-DCOPY_GSHHG:BOOL=FALSE" - "-DGSHHG_ROOT=${gshhg-gmt.out}/share/gshhg-gmt" - "-DCOPY_DCW:BOOL=FALSE" - "-DDCW_ROOT=${dcw-gmt.out}/share/dcw-gmt" - "-DGDAL_ROOT=${gdal.out}" - "-DNETCDF_ROOT=${netcdf.out}" - "-DPCRE_ROOT=${pcre.out}" - "-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES:BOOL=FALSE" - "-DGMT_ENABLE_OPENMP:BOOL=TRUE" - "-DGMT_INSTALL_MODULE_LINKS:BOOL=FALSE" - "-DLICENSE_RESTRICTED=LGPL" # "GPL" and "no" also valid - ] ++ (with stdenv; - lib.optionals (!isDarwin) [ + cmakeFlags = + [ + "-DGMT_DOCDIR=share/doc/gmt" + "-DGMT_MANDIR=share/man" + "-DGMT_LIBDIR=lib" + "-DCOPY_GSHHG:BOOL=FALSE" + "-DGSHHG_ROOT=${gshhg-gmt.out}/share/gshhg-gmt" + "-DCOPY_DCW:BOOL=FALSE" + "-DDCW_ROOT=${dcw-gmt.out}/share/dcw-gmt" + "-DGDAL_ROOT=${gdal.out}" + "-DNETCDF_ROOT=${netcdf.out}" + "-DPCRE_ROOT=${pcre.out}" + "-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES:BOOL=FALSE" + "-DGMT_ENABLE_OPENMP:BOOL=TRUE" + "-DGMT_INSTALL_MODULE_LINKS:BOOL=FALSE" + "-DLICENSE_RESTRICTED=LGPL" # "GPL" and "no" also valid + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DFFTW3_ROOT=${fftwSinglePrec.dev}" "-DLAPACK_LIBRARY=${lapack}/lib/liblapack.so" "-DBLAS_LIBRARY=${blas}/lib/libblas.so" - ]); + ]; - meta = with lib; { + meta = { homepage = "https://www.generic-mapping-tools.org"; description = "Tools for manipulating geographic and cartesian data sets"; longDescription = '' @@ -65,9 +103,9 @@ stdenv.mkDerivation rec { transformations and includes supporting data such as coastlines, rivers, and political boundaries and optionally country polygons. ''; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ tviti ]; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ tviti ]; }; -} +}) From b1f7700933ca3848548b1b460e9a3a3064e5db3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Sep 2024 07:44:20 +0000 Subject: [PATCH 08/27] python312Packages.treq: 23.11.0 -> 24.9.1 --- pkgs/development/python-modules/treq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 1d2a9b15374c..aa313179af97 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "treq"; - version = "23.11.0"; + version = "24.9.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-CRT/kp/RYyzhZ5cjUmD4vBnSD/fEWcHeq9ZbjGjL6sU="; + hash = "sha256-Fdp/xATz5O1Z0Kvl+O70lm+rvmGAOaKiO8fBUwXO/qg="; }; nativeBuildInputs = [ From 2501529a79b527c08a909737c8c1f88e8a945a0a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 29 Sep 2024 09:54:52 -0400 Subject: [PATCH 09/27] vulkan-validation-layers: fix cross compilation, set strictDeps --- .../tools/vulkan-validation-layers/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index d5de37245c21..c5331ea2475f 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { hash = "sha256-FMzQpc7mwZGib544w0Dx6LeGi64cercm5oUW45raasc="; }; + strictDeps = true; + nativeBuildInputs = [ cmake pkg-config @@ -40,12 +42,15 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + glslang libX11 libXau libXdmcp libXrandr libffi libxcb + robin-hood-hashing + spirv-headers spirv-tools vulkan-headers vulkan-utility-libraries @@ -53,11 +58,7 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DGLSLANG_INSTALL_DIR=${glslang}" - "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}" - "-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}" "-DBUILD_LAYER_SUPPORT_FILES=ON" - "-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config" # Hide dev warnings that are useless for packaging "-Wno-dev" ]; From d924b523e0bb70e7f4e07cdc431a3d30f4ac419d Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 30 Sep 2024 00:29:34 +0800 Subject: [PATCH 10/27] golex: init at 1.1.0 --- pkgs/by-name/go/golex/package.nix | 36 +++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/go/golex/package.nix diff --git a/pkgs/by-name/go/golex/package.nix b/pkgs/by-name/go/golex/package.nix new file mode 100644 index 000000000000..99884d4d2d02 --- /dev/null +++ b/pkgs/by-name/go/golex/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildGoModule, + fetchFromGitLab, + fetchpatch2, +}: + +buildGoModule rec { + pname = "golex"; + version = "1.1.0"; + + src = fetchFromGitLab { + owner = "cznic"; + repo = "golex"; + rev = "v${version}"; + hash = "sha256-0Z2oE00vGnH2BBNmKAjRhy//fEbT5AQ+CKLIUr+NPwY="; + }; + + patches = [ + # fix a unicode mismatch to make test pass + (fetchpatch2 { + url = "https://gitlab.com/cznic/golex/-/commit/a735a3b62b5fb36a715ba4e280270f9ca91c5e59.patch"; + hash = "sha256-Q/Vyh91IwL3ConWpJU0akslkaVhHTkBmrMbmDVU3Txs="; + }) + ]; + + vendorHash = "sha256-Ig4cxZepvmI1EH0j2fuQ33jHOLWfS40UE+A4UHdo8oE="; + + meta = { + description = "Lex/flex like utility rendering .l formated data to Go source code"; + homepage = "https://pkg.go.dev/modernc.org/golex"; + license = lib.licenses.bsd3; + mainProgram = "golex"; + maintainers = with lib.maintainers; [ aleksana ]; + }; +} From eac660eb4b5103cb89ea773b5fd907965401ef73 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 29 Sep 2024 10:25:18 +0300 Subject: [PATCH 11/27] gmt: fix build by overriding netcdf --- pkgs/applications/gis/gmt/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix index ec70ab02b1da..b33efefaefc1 100644 --- a/pkgs/applications/gis/gmt/default.nix +++ b/pkgs/applications/gis/gmt/default.nix @@ -9,6 +9,7 @@ CoreVideo, fftwSinglePrec, netcdf, + libxml2, pcre, gdal, blas, @@ -25,7 +26,15 @@ - graphicsmagick for gif output */ -stdenv.mkDerivation (finalAttrs: { +let + # Certainly not an ideal situation, See: + # https://github.com/NixOS/nixpkgs/pull/340707#issuecomment-2361894717 + netcdf' = netcdf.override { + libxml2 = libxml2.override { + enableHttp = true; + }; + }; +in stdenv.mkDerivation (finalAttrs: { pname = "gmt"; version = "6.4.0"; src = fetchFromGitHub { @@ -43,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { [ curl gdal - netcdf + netcdf' pcre dcw-gmt gshhg-gmt @@ -78,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { "-DCOPY_DCW:BOOL=FALSE" "-DDCW_ROOT=${dcw-gmt.out}/share/dcw-gmt" "-DGDAL_ROOT=${gdal.out}" - "-DNETCDF_ROOT=${netcdf.out}" + "-DNETCDF_ROOT=${netcdf'.out}" "-DPCRE_ROOT=${pcre.out}" "-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES:BOOL=FALSE" "-DGMT_ENABLE_OPENMP:BOOL=TRUE" From 6889e8eeeec391ad7c0c2d08a04a474d62ba050f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 29 Sep 2024 10:25:31 +0300 Subject: [PATCH 12/27] gmt: 6.4.0 -> 6.5.0 Diff: https://github.com/GenericMappingTools/gmt/compare/refs/tags/6.4.0...6.5.0 --- pkgs/applications/gis/gmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix index b33efefaefc1..2aff73095635 100644 --- a/pkgs/applications/gis/gmt/default.nix +++ b/pkgs/applications/gis/gmt/default.nix @@ -36,12 +36,12 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "gmt"; - version = "6.4.0"; + version = "6.5.0"; src = fetchFromGitHub { owner = "GenericMappingTools"; repo = "gmt"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-rRNEo7dGkmgrkhNCBacyfBYrl7zHnE0KMWQHT0Ekbo0="; + hash = "sha256-KKIYhljCtk9t9CuvTLsSGvUkUwazWTm9ymBB3wLwSoI="; }; nativeBuildInputs = [ From eccfe1c0ad400df7a7eb50aae7b7d8953900a050 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 29 Sep 2024 10:36:03 +0300 Subject: [PATCH 13/27] gmt: let it find libraries automatically --- pkgs/applications/gis/gmt/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix index 2aff73095635..9eb1bde4266d 100644 --- a/pkgs/applications/gis/gmt/default.nix +++ b/pkgs/applications/gis/gmt/default.nix @@ -86,18 +86,10 @@ in stdenv.mkDerivation (finalAttrs: { "-DGSHHG_ROOT=${gshhg-gmt.out}/share/gshhg-gmt" "-DCOPY_DCW:BOOL=FALSE" "-DDCW_ROOT=${dcw-gmt.out}/share/dcw-gmt" - "-DGDAL_ROOT=${gdal.out}" - "-DNETCDF_ROOT=${netcdf'.out}" - "-DPCRE_ROOT=${pcre.out}" "-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES:BOOL=FALSE" "-DGMT_ENABLE_OPENMP:BOOL=TRUE" "-DGMT_INSTALL_MODULE_LINKS:BOOL=FALSE" "-DLICENSE_RESTRICTED=LGPL" # "GPL" and "no" also valid - ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - "-DFFTW3_ROOT=${fftwSinglePrec.dev}" - "-DLAPACK_LIBRARY=${lapack}/lib/liblapack.so" - "-DBLAS_LIBRARY=${blas}/lib/libblas.so" ]; meta = { From daf41d07f9d3130c6bee63c9e694e77e3666e338 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Sep 2024 18:01:26 +0000 Subject: [PATCH 14/27] python312Packages.eigenpy: 3.9.1 -> 3.10.0 --- pkgs/development/python-modules/eigenpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index e45b5424a4b0..d1844d34baed 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "eigenpy"; - version = "3.9.1"; + version = "3.10.0"; pyproject = false; # Built with cmake src = fetchFromGitHub { owner = "stack-of-tasks"; repo = "eigenpy"; rev = "refs/tags/v${version}"; - hash = "sha256-nRslQMnVaVN7S20RuJDp+e9p+oMhsR03EjHYpvkuBYk="; + hash = "sha256-ac667pEKXcbLLzCVGKYpyCQO805qhCEf8dCnC4QwxBs="; }; outputs = [ From 1acaef2804466e9fb0d6024c1796fd026827565d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Sep 2024 18:01:47 +0000 Subject: [PATCH 15/27] python312Packages.qdrant-client: 1.11.2 -> 1.11.3 --- pkgs/development/python-modules/qdrant-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index d54ac47473a5..9755d531adc4 100644 --- a/pkgs/development/python-modules/qdrant-client/default.nix +++ b/pkgs/development/python-modules/qdrant-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qdrant-client"; - version = "1.11.2"; + version = "1.11.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = "qdrant-client"; rev = "refs/tags/v${version}"; - hash = "sha256-DVyaBQ8r52H9q2NNDsplfPxoxwZeK3pHNfnyw9a9hvw="; + hash = "sha256-1tBlWwD2GaphwupWUWRYwYrqGV9cTfG4k1L9N5mub/Q="; }; build-system = [ poetry-core ]; From ebc36a9dee03716949e97a6310a21199a8e6e9a0 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Sat, 28 Sep 2024 22:41:05 +0200 Subject: [PATCH 16/27] python312Packages.pygmt: unbreak on Darwin --- pkgs/development/python-modules/pygmt/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index 852690233304..a5850801030e 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -67,8 +67,6 @@ buildPythonPackage rec { homepage = "https://github.com/GenericMappingTools/pygmt"; license = licenses.bsd3; changelog = "https://github.com/GenericMappingTools/pygmt/releases/tag/v${version}"; - # pygmt.exceptions.GMTCLibNotFoundError: Error loading the GMT shared library '/nix/store/r3xnnqgl89vrnq0kzxx0bmjwzks45mz8-gmt-6.1.1/lib/libgmt.dylib' - broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ sikmir ]; }; } From 63306af816bc75c40d783fed2a948ea45fb18b20 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Sep 2024 22:06:04 +0200 Subject: [PATCH 17/27] python312Packages.py-ocsf-models: init at 0.1.1 OCSF models in Python using Pydantic https://github.com/prowler-cloud/py-ocsf-models --- .../python-modules/py-ocsf-models/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/py-ocsf-models/default.nix diff --git a/pkgs/development/python-modules/py-ocsf-models/default.nix b/pkgs/development/python-modules/py-ocsf-models/default.nix new file mode 100644 index 000000000000..b98f5228ec06 --- /dev/null +++ b/pkgs/development/python-modules/py-ocsf-models/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + cryptography, + email-validator, + fetchFromGitHub, + poetry-core, + pydantic, + pytestCheckHook, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "py-ocsf-models"; + version = "0.1.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "prowler-cloud"; + repo = "py-ocsf-models"; + rev = "refs/tags/${version}"; + hash = "sha256-NGhlMBNoa8V3vo/z6OBAWqNCSlTyUutiyrTcCe1KF+4="; + }; + + pythonRelaxDeps = true; + + build-system = [ poetry-core ]; + + dependencies = [ + cryptography + email-validator + pydantic + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + # Tests are outdated + doCheck = false; + + pythonImportsCheck = [ "py_ocsf_models" ]; + + meta = { + description = "OCSF models in Python using Pydantic"; + homepage = "https://github.com/prowler-cloud/py-ocsf-models"; + changelog = "https://github.com/prowler-cloud/py-ocsf-models/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09fbd6fd81de..e3eceed3df54 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9119,6 +9119,8 @@ self: super: with self; { py-machineid = callPackage ../development/python-modules/py-machineid { }; + py-ocsf-models = callPackage ../development/python-modules/py-ocsf-models { }; + py-opensonic = callPackage ../development/python-modules/py-opensonic { }; py-radix-sr = callPackage ../development/python-modules/py-radix-sr { }; From e08b1081c9c1899777bf5ccf806b873765c753f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Sep 2024 01:45:58 +0200 Subject: [PATCH 18/27] python312Packages.aiovlc: 0.5.0 -> 0.6.0 Diff: https://github.com/MartinHjelmare/aiovlc/compare/refs/tags/v0.5.0...v0.6.0 Changelog: https://github.com/MartinHjelmare/aiovlc/blob/v0.6.0/CHANGELOG.md --- pkgs/development/python-modules/aiovlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiovlc/default.nix b/pkgs/development/python-modules/aiovlc/default.nix index 329cfee05257..cfebe114b4ce 100644 --- a/pkgs/development/python-modules/aiovlc/default.nix +++ b/pkgs/development/python-modules/aiovlc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiovlc"; - version = "0.5.0"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiovlc"; rev = "refs/tags/v${version}"; - hash = "sha256-F66HGfbsve/jYyUEapUTVtLxaEIW63r3eNNk7mXOx5Y="; + hash = "sha256-2YG/m/z2xHUep2VJuCQs4+gGHUolj/u3kycpYZmUyBs="; }; build-system = [ poetry-core ]; From e4f84e3e6cdf15e92638697cae5fdefeb6363110 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Sep 2024 00:27:00 +0000 Subject: [PATCH 19/27] gleam: 1.5.0 -> 1.5.1 --- pkgs/development/compilers/gleam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 279136ac60e2..650e46ff51b1 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-buMnbBg+/vHXzbBuMPuV8AfdUmYA9J6WTXP7Oqrdo34="; + hash = "sha256-4/NDZGq62M0tdWerIkmoYS0WHC06AV8c9vlo/6FhsAo="; }; nativeBuildInputs = [ git pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-0Vtf9UXLPW5HuqNIAGNyqIXCMTITdG7PuFdw4H4v6a4="; + cargoHash = "sha256-B8tCVkubP04gAHKQC0idR5AjpVHG/kCXvPCfwKCuaSo="; passthru.updateScript = nix-update-script { }; From ec50ae00b1ba4dc9f3f324cd8ada96bd261e1e5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Sep 2024 00:54:16 +0000 Subject: [PATCH 20/27] picom-pijulius: 8.2-unstable-2024-09-14 -> 8.2-unstable-2024-09-27 --- pkgs/by-name/pi/picom-pijulius/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/picom-pijulius/package.nix b/pkgs/by-name/pi/picom-pijulius/package.nix index 6cb67fe25999..686e9c371bb9 100644 --- a/pkgs/by-name/pi/picom-pijulius/package.nix +++ b/pkgs/by-name/pi/picom-pijulius/package.nix @@ -9,13 +9,13 @@ }: picom.overrideAttrs (previousAttrs: { pname = "picom-pijulius"; - version = "8.2-unstable-2024-09-14"; + version = "8.2-unstable-2024-09-27"; src = fetchFromGitHub { owner = "pijulius"; repo = "picom"; - rev = "0c46ea546d9c507e744612e80b25ef5dfa531855"; - hash = "sha256-g/RknjZh5O2/3Plk1w8QnNywWZXZaABfunBY6XyixnA="; + rev = "d1d5a32d9ac125e1db1c2235834060fd0535b262"; + hash = "sha256-1ycxVHaWpqGD1GuWQ8dpKrbmSSSQS8CoaY56wM18bWk="; }; buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ pcre ]; From fafa8272c22caa0efa4000726af1deea4700c376 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Sep 2024 01:39:58 +0000 Subject: [PATCH 21/27] roddhjav-apparmor-rules: 0-unstable-2024-09-19 -> 0-unstable-2024-09-27 --- pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix index 93c4fab10a9c..dcc5606ea4ea 100644 --- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix +++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "roddhjav-apparmor-rules"; - version = "0-unstable-2024-09-19"; + version = "0-unstable-2024-09-27"; src = fetchFromGitHub { owner = "roddhjav"; repo = "apparmor.d"; - rev = "7a3a1f7725d07cbd7d969bba2649f31d330d1e40"; - hash = "sha256-6P3dNNcPGPux/Epr0vIrEEl7To399UzJfb4Uq8MT5p4="; + rev = "a8c18f9b9418ac42922eee1e31b1e3c9f791c1dc"; + hash = "sha256-LUHU6Buh+91b99pF7d8jqmAoYD1EmkKzsAOxiP7w3So="; }; dontConfigure = true; From c48691642f42f43639642c8c6ac82beee2aef03b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 24 Sep 2024 20:33:32 +0200 Subject: [PATCH 22/27] ocamlPackages.eio-ssl: init at 0.3.0 --- .../ocaml-modules/eio-ssl/default.nix | 24 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/ocaml-modules/eio-ssl/default.nix diff --git a/pkgs/development/ocaml-modules/eio-ssl/default.nix b/pkgs/development/ocaml-modules/eio-ssl/default.nix new file mode 100644 index 000000000000..087a667d4e2d --- /dev/null +++ b/pkgs/development/ocaml-modules/eio-ssl/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildDunePackage +, fetchurl +, eio +, ssl +}: + +buildDunePackage rec { + pname = "eio-ssl"; + version = "0.3.0"; + + src = fetchurl { + url = "https://github.com/anmonteiro/eio-ssl/releases/download/${version}/eio-ssl-${version}.tbz"; + hash = "sha256-m4CiUQtXVSMfLthbDsAftpiOsr24I5IGiU1vv7Rz8go="; + }; + + propagatedBuildInputs = [ eio ssl ]; + + meta = { + homepage = "https://github.com/anmonteiro/eio-ssl"; + description = "OpenSSL binding to EIO"; + license = lib.licenses.lgpl21; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f40b306ee364..61429ca4bfaf 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -444,6 +444,8 @@ let eio_main = callPackage ../development/ocaml-modules/eio/main.nix { }; eio_posix = callPackage ../development/ocaml-modules/eio/posix.nix { }; + eio-ssl = callPackage ../development/ocaml-modules/eio-ssl { }; + either = callPackage ../development/ocaml-modules/either { }; elina = callPackage ../development/ocaml-modules/elina { }; From 7e69dfd3c0c4ce81613a6a3b28f31ac03b31a464 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 24 Sep 2024 20:33:39 +0200 Subject: [PATCH 23/27] ocamlPackages.httpun: init at 0.2.0 --- .../ocaml-modules/httpun/default.nix | 22 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/ocaml-modules/httpun/default.nix diff --git a/pkgs/development/ocaml-modules/httpun/default.nix b/pkgs/development/ocaml-modules/httpun/default.nix new file mode 100644 index 000000000000..f45ffe5eca2e --- /dev/null +++ b/pkgs/development/ocaml-modules/httpun/default.nix @@ -0,0 +1,22 @@ +{ buildDunePackage +, httpun-types +, angstrom +, bigstringaf +, faraday +, alcotest +}: + +buildDunePackage { + pname = "httpun"; + + inherit (httpun-types) src version; + + propagatedBuildInputs = [ angstrom bigstringaf faraday httpun-types ]; + + doCheck = true; + checkInputs = [ alcotest ]; + + meta = httpun-types.meta // { + description = "A high-performance, memory-efficient, and scalable HTTP library for OCaml"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 61429ca4bfaf..c3c71efa41e0 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -691,6 +691,8 @@ let httpaf-lwt-unix = callPackage ../development/ocaml-modules/httpaf/lwt-unix.nix { }; + httpun = callPackage ../development/ocaml-modules/httpun { }; + httpun-types = callPackage ../development/ocaml-modules/httpun/types.nix { }; hxd = callPackage ../development/ocaml-modules/hxd { }; From e2be410cefbe56df3199b4632da37999e415f384 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 24 Sep 2024 20:33:44 +0200 Subject: [PATCH 24/27] ocamlPackages.httpun-eio: init at 0.2.0 --- pkgs/development/ocaml-modules/httpun/eio.nix | 16 ++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/ocaml-modules/httpun/eio.nix diff --git a/pkgs/development/ocaml-modules/httpun/eio.nix b/pkgs/development/ocaml-modules/httpun/eio.nix new file mode 100644 index 000000000000..1b3160d699f1 --- /dev/null +++ b/pkgs/development/ocaml-modules/httpun/eio.nix @@ -0,0 +1,16 @@ +{ buildDunePackage +, httpun +, gluten-eio +}: + +buildDunePackage { + pname = "httpun-eio"; + + inherit (httpun) src version; + + propagatedBuildInputs = [ gluten-eio httpun ]; + + meta = httpun.meta // { + description = "EIO support for httpun"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c3c71efa41e0..4f98f1ff6963 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -693,6 +693,8 @@ let httpun = callPackage ../development/ocaml-modules/httpun { }; + httpun-eio = callPackage ../development/ocaml-modules/httpun/eio.nix { }; + httpun-types = callPackage ../development/ocaml-modules/httpun/types.nix { }; hxd = callPackage ../development/ocaml-modules/hxd { }; From 75a60571b46a58093203ccf830186df71ded6ad6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 24 Sep 2024 20:33:48 +0200 Subject: [PATCH 25/27] ocamlPackages.httpun-ws: init at 0.2.0 --- .../ocaml-modules/httpun-ws/default.nix | 40 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/ocaml-modules/httpun-ws/default.nix diff --git a/pkgs/development/ocaml-modules/httpun-ws/default.nix b/pkgs/development/ocaml-modules/httpun-ws/default.nix new file mode 100644 index 000000000000..89ac696301b3 --- /dev/null +++ b/pkgs/development/ocaml-modules/httpun-ws/default.nix @@ -0,0 +1,40 @@ +{ lib +, fetchurl +, buildDunePackage +, angstrom +, base64 +, bigstringaf +, faraday +, gluten +, httpun +, alcotest +}: + +buildDunePackage rec { + pname = "httpun-ws"; + version = "0.2.0"; + + src = fetchurl { + url = "https://github.com/anmonteiro/httpun-ws/releases/download/${version}/httpun-ws-${version}.tbz"; + hash = "sha256-6uDNLg61tPyctthitxFqbw/IUDsuQ5BGvw5vTLLCl/0="; + }; + + propagatedBuildInputs = [ + angstrom + base64 + bigstringaf + faraday + gluten + httpun + ]; + + doCheck = true; + checkInputs = [ alcotest ]; + + meta = { + description = "Websocket implementation for httpun"; + license = lib.licenses.bsd3; + homepage = "https://github.com/anmonteiro/httpun-ws"; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4f98f1ff6963..152270cf5fab 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -697,6 +697,8 @@ let httpun-types = callPackage ../development/ocaml-modules/httpun/types.nix { }; + httpun-ws = callPackage ../development/ocaml-modules/httpun-ws { }; + hxd = callPackage ../development/ocaml-modules/hxd { }; ### I ### From 57617c48efde1cc0039fddea206f3eedb0e10ea3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 24 Sep 2024 20:33:52 +0200 Subject: [PATCH 26/27] ocamlPackages.h2-eio: init at 0.13.0 --- pkgs/development/ocaml-modules/h2/eio.nix | 18 ++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/ocaml-modules/h2/eio.nix diff --git a/pkgs/development/ocaml-modules/h2/eio.nix b/pkgs/development/ocaml-modules/h2/eio.nix new file mode 100644 index 000000000000..0beb6f3e086e --- /dev/null +++ b/pkgs/development/ocaml-modules/h2/eio.nix @@ -0,0 +1,18 @@ +{ buildDunePackage +, h2 +, eio +, gluten-eio +}: + +buildDunePackage { + pname = "h2-eio"; + + inherit (h2) src version; + + propagatedBuildInputs = [ eio gluten-eio h2 ]; + + meta = h2.meta // { + description = "EIO support for h2"; + }; +} + diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 152270cf5fab..3cbb1dc8a4bc 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -660,6 +660,8 @@ let h2 = callPackage ../development/ocaml-modules/h2 { }; + h2-eio = callPackage ../development/ocaml-modules/h2/eio.nix { }; + hack_parallel = callPackage ../development/ocaml-modules/hack_parallel { }; hacl-star = callPackage ../development/ocaml-modules/hacl-star { }; From d31bb1e0761e9fd7215558eff3ed2e5db55306df Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 24 Sep 2024 20:33:56 +0200 Subject: [PATCH 27/27] =?UTF-8?q?piaf:=200.1.0=20=E2=86=92=200.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/piaf/default.nix | 59 ++++++++++--------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/pkgs/development/ocaml-modules/piaf/default.nix b/pkgs/development/ocaml-modules/piaf/default.nix index 991764336657..9c2e481b76e4 100644 --- a/pkgs/development/ocaml-modules/piaf/default.nix +++ b/pkgs/development/ocaml-modules/piaf/default.nix @@ -1,52 +1,57 @@ -{ alcotest-lwt +{ alcotest , buildDunePackage -, ocaml -, bigarray-compat -, dune-site , fetchurl -, gluten-lwt-unix +, eio-ssl +, faraday +, h2-eio +, httpun-eio +, httpun-ws +, ipaddr +, ke , lib , logs , magic-mime -, mrmime -, psq -, rresult +, pecu +, prettym +, unstrctrd , uri +, uutf +, dune-site +, eio_main }: -lib.throwIf (lib.versionAtLeast ocaml.version "5.0") - "piaf is not available for OCaml ${ocaml.version}" - buildDunePackage rec { pname = "piaf"; - version = "0.1.0"; + version = "0.2.0"; src = fetchurl { url = "https://github.com/anmonteiro/piaf/releases/download/${version}/piaf-${version}.tbz"; - hash = "sha256-AMO+ptGox33Bi7u/H0SaeCU88XORrRU3UbLof3EwcmU="; + hash = "sha256-B/qQCaUvrqrm2GEW51AH9SebGFx7x8laq5RV8hBzcPs="; }; - postPatch = '' - substituteInPlace ./vendor/dune --replace "mrmime.prettym" "prettym" - ''; - propagatedBuildInputs = [ - bigarray-compat + eio-ssl + faraday + h2-eio + httpun-eio + httpun-ws + ipaddr logs magic-mime - mrmime - psq - rresult + pecu + prettym + unstrctrd uri - gluten-lwt-unix + uutf ]; - nativeCheckInputs = [ - alcotest-lwt - dune-site - ]; - # Check fails with OpenSSL 3 + # Some test cases fail doCheck = false; + checkInputs = [ + alcotest + dune-site + eio_main + ]; meta = { description = "HTTP library with HTTP/2 support written entirely in OCaml";