diff --git a/pkgs/by-name/he/hellmaker/package.nix b/pkgs/by-name/he/hellmaker/package.nix new file mode 100644 index 000000000000..d05e612dbc80 --- /dev/null +++ b/pkgs/by-name/he/hellmaker/package.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, python3 +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "hellmaker"; + version = "0-unstable-2023-03-18"; + + src = fetchFromGitHub { + owner = "0xNinjaCyclone"; + repo = "hellMaker"; + rev = "2e9efe2aed9412f67a8606544392a2df10d3a2d0"; + hash = "sha256-zbtzlYGCLW/lt7GJvMHao/MZhdghNBQCQsjUImL1RC4="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,share/hellmaker} + cp -R * $out/share/hellmaker + makeWrapper ${python3.interpreter} $out/bin/hellmaker \ + --set PYTHONPATH "$PYTHONPATH:$out/share/hellmaker/hellMaker.py" \ + --add-flags "$out/share/hellmaker/hellMaker.py" + runHook postInstall + ''; + + meta = { + description = "Generate FUD backdoors"; + homepage = "https://github.com/0xNinjaCyclone/hellMaker"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tochiaha ]; + mainProgram = "hellmaker"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/li/libstudxml/package.nix b/pkgs/by-name/li/libstudxml/package.nix new file mode 100644 index 000000000000..ceaf052eee70 --- /dev/null +++ b/pkgs/by-name/li/libstudxml/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchgit, + build2, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libstudxml"; + version = "1.1.0-b.10+2"; + + src = fetchgit { + url = "https://git.codesynthesis.com/libstudxml/libstudxml.git"; + rev = "v${finalAttrs.version}"; + hash = "sha256-OsjMhQ3u/wLhOay7qg9sQMEhnAOdrO30dsKQ8aDWUOo="; + }; + + outputs = [ + "out" + "dev" + "doc" + ]; + + nativeBuildInputs = [ build2 ]; + + # lib files are not marked as executable by default + postInstall = '' + chmod +x "$out"/lib/* + ''; + + meta = { + description = "A streaming XML pull parser and streaming XML serializer implementation for modern, standard C++"; + homepage = "https://www.codesynthesis.com/projects/libstudxml/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/xo/xonsh/package.nix b/pkgs/by-name/xo/xonsh/package.nix index 1882a3096635..de199ff4bc05 100644 --- a/pkgs/by-name/xo/xonsh/package.nix +++ b/pkgs/by-name/xo/xonsh/package.nix @@ -14,7 +14,8 @@ let in runCommand "xonsh-${xonsh-unwrapped.version}" { - inherit (xonsh-unwrapped) pname version meta passthru; + inherit (xonsh-unwrapped) pname version meta; + passthru = xonsh-unwrapped.passthru // { unwrapped = xonsh-unwrapped; }; } '' mkdir -p $out/bin for bin in ${lib.getBin xonsh-unwrapped}/bin/*; do diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 5c647aaadfe6..2cfce8ed2040 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.3.19"; + version = "22.3.20"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-y35rcAo1CR8HvKD4hCtdMSSPSSnGaUf4l2Tdzbq5fFw="; + sha256 = "sha256-AqHzWm0ZWCJK0gMXxxBSHemKx3U1fOXCUGo/ORny2hI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix index 9593781f2270..8c07b2aad31a 100644 --- a/pkgs/development/libraries/medfile/default.nix +++ b/pkgs/development/libraries/medfile/default.nix @@ -1,19 +1,39 @@ { lib, stdenv, fetchurl, cmake, hdf5 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "medfile"; - version = "4.1.1"; + version = "5.0.0"; src = fetchurl { - url = "http://files.salome-platform.org/Salome/other/med-${version}.tar.gz"; - sha256 = "sha256-3CtdVOvwZm4/8ul0BB0qsNqQYGEyNTcCOrFl1XM4ndA="; + url = "https://files.salome-platform.org/Salome/medfile/med-${finalAttrs.version}.tar.bz2"; + hash = "sha256-Jn520MZ+xRwQ4xmUhOwVCLqo1e2EXGKK32YFKdzno9Q="; }; - patches = [ - ./hdf5-1.14.patch - ]; + outputs = [ "out" "doc" "dev" ]; + + postPatch = '' + # Patch cmake and source files to work with hdf5 + substituteInPlace config/cmake_files/medMacros.cmake --replace-fail \ + "IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 12 OR NOT HDF_VERSION_RELEASE_REF GREATER 0)" \ + "IF (HDF5_VERSION VERSION_LESS 1.12.0)" + substituteInPlace src/*/*.c --replace-warn \ + "#if H5_VERS_MINOR > 12" \ + "#if H5_VERS_MINOR > 14" + '' + lib.optionalString stdenv.isDarwin '' + # Some medfile test files #define _a, which + # breaks system header files that use _a as a function parameter + substituteInPlace tests/c/*.c \ + --replace-warn "_a" "_A" \ + --replace-warn "_b" "_B" + # Fix compiler errors in test files + substituteInPlace tests/c/*.c \ + --replace-warn "med_Bool" "med_bool" \ + --replace-warn "med_Axis_type" "med_axis_type" \ + --replace-warn "med_Access_mode" "med_access_mode" + ''; nativeBuildInputs = [ cmake ]; + buildInputs = [ hdf5 ]; checkPhase = "make test"; @@ -22,8 +42,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library to read and write MED files"; - homepage = "http://salome-platform.org/"; - platforms = platforms.linux; + homepage = "https://salome-platform.org/"; + platforms = platforms.linux ++ platforms.darwin; license = licenses.lgpl3Plus; }; -} +}) diff --git a/pkgs/development/libraries/medfile/hdf5-1.14.patch b/pkgs/development/libraries/medfile/hdf5-1.14.patch deleted file mode 100644 index 294e87c023a7..000000000000 --- a/pkgs/development/libraries/medfile/hdf5-1.14.patch +++ /dev/null @@ -1,86 +0,0 @@ ---- a/config/cmake_files/medMacros.cmake -+++ b/config/cmake_files/medMacros.cmake -@@ -447,7 +447,7 @@ MACRO(MED_FIND_HDF5) - ## - ## Requires 1.10.x version - ## -- IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1) -+ IF (HDF5_VERSION VERSION_LESS 1.10.2) - MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.") - ENDIF() - ## ---- a/src/ci/MEDfileCompatibility.c -+++ b/src/ci/MEDfileCompatibility.c -@@ -71,7 +71,7 @@ MEDfileCompatibility(const char* const filename, - _hversionMMR=10000*_hmajeur+100*_hmineur+_hrelease; - /* ISCRUTE(_hversionMMR); */ - /* ISCRUTE(HDF_VERSION_NUM_REF); */ -- if ( (_hversionMMR >= HDF_VERSION_NUM_REF) && (_hmineur == HDF_VERSION_MINOR_REF) ) *hdfok = MED_TRUE; -+ if ( ((_hversionMMR >= HDF_VERSION_NUM_REF) && (_hmineur == HDF_VERSION_MINOR_REF)) || _hversionMMR > HDF_VERSION_NUM_REF ) *hdfok = MED_TRUE; - - /* TODO : Vérifier si la version mineure HDF du fichier est supérieure - à la version mineure de la bibliothèque HDF utilisée : -@@ -113,7 +113,7 @@ MEDfileCompatibility(const char* const filename, - #if MED_NUM_MAJEUR != 4 - #error "Don't forget to update the test version here when you change the major version of the library !" - #endif --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 14 - #error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !" - #error "Cf. _MEDfileCreate ..." - #endif ---- a/src/hdfi/_MEDfileCreate.c -+++ b/src/hdfi/_MEDfileCreate.c -@@ -159,7 +159,7 @@ med_idt _MEDfileCreate(const char * const filename, const med_access_mode access - * En HDF5-1.10.0p1 cela n'a aucun effet ! - * Un test autoconf permet de fixer un intervalle de version HDF à MED. - */ --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 14 - #error "Don't forget to change the compatibility version of the library !" - #endif - ---- a/src/hdfi/_MEDfileOpen.c -+++ b/src/hdfi/_MEDfileOpen.c -@@ -72,7 +72,7 @@ med_idt _MEDfileOpen(const char * const filename,const med_access_mode accessmod - - • The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order). - */ --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 14 - #error "Don't forget to change the compatibility version of the library !" - #endif - /* L'avantage de bloquer le modèle interne HDF5 ---- a/src/hdfi/_MEDmemFileOpen.c -+++ b/src/hdfi/_MEDmemFileOpen.c -@@ -434,7 +434,7 @@ med_idt _MEDmemFileOpen(const char * const filename, med_memfile * const memfile - goto ERROR; - } - --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 14 - #error "Don't forget to change the compatibility version of the library !" - #endif - if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) { ---- a/src/hdfi/_MEDparFileCreate.c -+++ b/src/hdfi/_MEDparFileCreate.c -@@ -64,7 +64,7 @@ med_idt _MEDparFileCreate(const char * const filename, const med_access_mode acc - * En HDF5-1.10.0p1 cela n'a aucun effet ! - * Un test autoconf permet de fixer un intervalle de version HDF à MED. - */ --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 14 - #error "Don't forget to change the compatibility version of the library !" - #endif - ---- a/src/hdfi/_MEDparFileOpen.c -+++ b/src/hdfi/_MEDparFileOpen.c -@@ -55,7 +55,7 @@ med_idt _MEDparFileOpen(const char * const filename,const med_access_mode access - MED_ERR_(_fid,MED_ERR_INIT,MED_ERR_PROPERTY,MED_ERR_PARALLEL_MSG); - goto ERROR; - } --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 14 - #error "Don't forget to change the compatibility version of the library !" - #endif - if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) { diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index ff6f2e73fcbc..ecbe751472a2 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -62,7 +62,7 @@ final: prev: let - inherit (prev) luaOlder luaAtLeast lua isLuaJIT; + inherit (prev) luaOlder luaAtLeast lua isLuaJIT isLua51; in { argparse = prev.argparse.overrideAttrs(oa: { @@ -524,6 +524,27 @@ in }; }); + neotest = prev.neotest.overrideAttrs(oa: { + doCheck = true; + nativeCheckInputs = oa.nativeCheckInputs ++ [ + final.nlua final.busted neovim-unwrapped + ]; + + # stick to neovim's lua version else loading shared libraries fail + meta = oa.meta // { broken = !isLua51; }; + + checkPhase = '' + runHook preCheck + export HOME=$(mktemp -d) + export LUA_PATH="./lua/?.lua;./lua/?/init.lua;$LUA_PATH" + nvim --headless -i NONE \ + --cmd "set rtp+=${vimPlugins.plenary-nvim}" \ + -c "PlenaryBustedDirectory tests/ {}" + + runHook postCheck + ''; + }); + haskell-tools-nvim = prev.haskell-tools-nvim.overrideAttrs(oa: { doCheck = lua.luaversion == "5.1"; nativeCheckInputs = [ final.nlua final.busted ]; diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index 49e5da716a85..35c178941bdd 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "safety"; - version = "3.2.0"; + version = "3.2.2"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-i9XKtfPYphzg6m6Y8mfBAG0FYJfEXGRP7nr+/31ZScE="; + hash = "sha256-KlhnAEqh487ckAAKtyb9rSzgrheYY8GxaX1+je0bjNs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index 113a92391a03..591df46640db 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { ''; buildInputs = [ + numpy.blas pillow glibcLocales ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; @@ -60,8 +61,6 @@ buildPythonPackage rec { wheel ]; - propagatedBuildInputs = [ numpy.blas ]; - dependencies = [ joblib numpy diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index a78cc466d9ae..c29aa09876c1 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchPypi, pythonOlder, @@ -88,6 +89,7 @@ buildPythonPackage rec { homepage = "http://www.tryton.org/"; changelog = "https://foss.heptapod.net/tryton/tryton/-/blob/trytond-${version}/trytond/CHANGELOG?ref_type=tags"; license = licenses.gpl3Plus; + broken = stdenv.isDarwin; maintainers = with maintainers; [ udono johbo diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 38e82c983800..dae222203992 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.10-rc1", - "hash": "sha256:006frl76cwi9a4mw7x6vsyazgrjfiz1gn4q4hvpykqql5mar3a05" + "version": "6.10-rc2", + "hash": "sha256:1c6ipsw7v1j849lmg4llfpm4j140kadi0i1w9fqb1rmfbp7vkp62" }, "6.1": { "version": "6.1.92", diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0d897aeb2fbf..cbb5d593f1ae 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1398,7 +1398,7 @@ mapAliases ({ xineLib = xine-lib; # Added 2021-04-27 xineUI = xine-ui; # Added 2021-04-27 xmlada = gnatPackages.xmlada; # Added 2024-02-25 - xonsh-unwrapped = throw "'xonsh-unwrapped' was incorporated into xonsh code; call xonsh directly instead."; # Added 2024-01-20 + xonsh-unwrapped = xonsh.passthru.unwrapped; xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25 xulrunner = firefox-unwrapped; # Added 2023-11-03 xvfb_run = xvfb-run; # Added 2021-05-07