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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2024-09-30 06:04:57 +00:00
committed by GitHub
parent 6471602fa4 5140208775
commit d8d87352c6
26 changed files with 423 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/gis/gmt/default.nix
+89 -50
View File
@@ -1,59 +1,98 @@
{ 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,
libxml2,
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 {
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 = fetchurl {
url = "https://github.com/GenericMappingTools/gmt/releases/download/${version}/gmt-${version}-src.tar.gz";
sha256 = "sha256-0mfAx9b7MMnqfgKe8n2tsm/9e5LLS0cD+aO6Do85Ohs=";
version = "6.5.0";
src = fetchFromGitHub {
owner = "GenericMappingTools";
repo = "gmt";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-KKIYhljCtk9t9CuvTLsSGvUkUwazWTm9ymBB3wLwSoI=";
};
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) [
"-DFFTW3_ROOT=${fftwSinglePrec.dev}"
"-DLAPACK_LIBRARY=${lapack}/lib/liblapack.so"
"-DBLAS_LIBRARY=${blas}/lib/libblas.so"
]);
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"
"-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
];
meta = with lib; {
meta = {
homepage = "https://www.generic-mapping-tools.org";
description = "Tools for manipulating geographic and cartesian data sets";
longDescription = ''
@@ -65,9 +104,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 ];
};
}
})
pkgs/by-name/fr/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch
+27 -30
View File
@@ -1,44 +1,43 @@
From c4f452ef6ae083ed21095313582f6d1bd775cbf3 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 2 Nov 2023 17:32:07 +0100
Subject: [PATCH] NIXOS: don't ignore PYTHONPATH
commit c534a831c2f7186ebabe4e17f1e1df6d11ebff89
Author: Samuel Rounce <me@samuelrounce.co.uk>
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
pkgs/by-name/fr/freecad/0002-FreeCad-OndselSolver-pkgconfig.patch
+7
View File
@@ -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@
pkgs/by-name/fr/freecad/package.nix
+15 -5
View File
@@ -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.0rc2";
src = fetchFromGitHub {
owner = "FreeCAD";
repo = "FreeCAD";
rev = finalAttrs.version;
hash = "sha256-OX4s9rbGsAhH7tLJkUJYyq2A2vCdkq/73iqYo9adogs=";
hash = "sha256-kPmfx/C1fCYwBqh6ZOKZAVNVR9m3VryPmBKu3ksDD5E=";
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;
};
})
pkgs/by-name/go/golex/package.nix
+36
View File
@@ -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 ];
};
}
pkgs/by-name/pi/picom-pijulius/package.nix
+3 -3
View File
@@ -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 ];
pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
+3 -3
View File
@@ -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;
pkgs/by-name/si/simplex-chat-desktop/package.nix
+2 -2
View File
@@ -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 {
pkgs/development/compilers/gleam/default.nix
+3 -3
View File
@@ -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 { };
pkgs/development/ocaml-modules/eio-ssl/default.nix
+24
View File
@@ -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;
};
}
pkgs/development/ocaml-modules/h2/eio.nix
+18
View File
@@ -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";
};
}
pkgs/development/ocaml-modules/httpun-ws/default.nix
+40
View File
@@ -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 ];
};
}
pkgs/development/ocaml-modules/httpun/default.nix
+22
View File
@@ -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";
};
}
pkgs/development/ocaml-modules/httpun/eio.nix
+16
View File
@@ -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";
};
}
pkgs/development/ocaml-modules/piaf/default.nix
+32 -27
View File
@@ -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";
pkgs/development/python-modules/aiovlc/default.nix
+2 -2
View File
@@ -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 ];
pkgs/development/python-modules/eigenpy/default.nix
+2 -2
View File
@@ -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 = [
pkgs/development/python-modules/py-ocsf-models/default.nix
+51
View File
@@ -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 ];
};
}
pkgs/development/python-modules/pygmt/default.nix
-2
View File
@@ -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 ];
};
}
pkgs/development/python-modules/pysmb/default.nix
+7 -4
View File
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
pyasn1,
pythonOlder,
tqdm,
@@ -9,8 +10,8 @@
buildPythonPackage rec {
pname = "pysmb";
version = "1.2.9.1";
format = "setuptools";
version = "1.2.10";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -18,10 +19,12 @@ buildPythonPackage rec {
owner = "miketeo";
repo = "pysmb";
rev = "refs/tags/pysmb-${version}";
hash = "sha256-psV6fYymE6k2YqxOvFM2s7JTG51fI5pSqmkZnvfmprw=";
hash = "sha256-Zid6KGNr7BBuyHaxdXkhRC/Ug93HmVXKMtreFf+M7OE=";
};
propagatedBuildInputs = [
build-system = [ setuptools ];
dependencies = [
pyasn1
tqdm
];
pkgs/development/python-modules/qdrant-client/default.nix
+2 -2
View File
@@ -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 ];
pkgs/development/python-modules/treq/default.nix
+2 -2
View File
@@ -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 = [
pkgs/development/tools/vulkan-validation-layers/default.nix
+5 -4
View File
@@ -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"
];
pkgs/servers/web-apps/outline/default.nix
+3 -3
View File
@@ -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 = ''
pkgs/top-level/ocaml-packages.nix
+10
View File
@@ -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 { };
@@ -658,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 { };
@@ -689,8 +693,14 @@ let
httpaf-lwt-unix = callPackage ../development/ocaml-modules/httpaf/lwt-unix.nix { };
httpun = callPackage ../development/ocaml-modules/httpun { };
httpun-eio = callPackage ../development/ocaml-modules/httpun/eio.nix { };
httpun-types = callPackage ../development/ocaml-modules/httpun/types.nix { };
httpun-ws = callPackage ../development/ocaml-modules/httpun-ws { };
hxd = callPackage ../development/ocaml-modules/hxd { };
### I ###
pkgs/top-level/python-packages.nix
+2
View File
@@ -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 { };