Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
4abb5b6274
|
|
@ -1707,6 +1707,12 @@
|
|||
githubId = 3086255;
|
||||
name = "Barry Moore II";
|
||||
};
|
||||
chivay = {
|
||||
email = "hubert.jasudowicz@gmail.com";
|
||||
github = "chivay";
|
||||
githubId = 14790226;
|
||||
name = "Hubert Jasudowicz";
|
||||
};
|
||||
chkno = {
|
||||
email = "chuck@intelligence.org";
|
||||
github = "chkno";
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fig2dev";
|
||||
version = "3.2.8";
|
||||
version = "3.2.8a";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz";
|
||||
sha256 = "0zg29yqknfafyzmmln4k7kydfb2dapk3r8ffvlqhj3cm8fp5h4lk";
|
||||
sha256 = "1bm75lf9j54qpbjx8hzp6ixaayp1x9w4v3yxl6vxyw8g5m4sqdk3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pdfcpu";
|
||||
version = "0.3.9";
|
||||
version = "0.3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdfcpu";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-btkGn/67KVFB272j7u5MKZCeby2fyRthLLeXj8VgX7s=";
|
||||
sha256 = "sha256-kLRxZW89Bm2N/KxFYetIq+auPBW/vFoUnB8uaEcM8Yo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-/SsDDFveovJfuEdnOkxHAWccS8PJW5k9IHSxSJAgHMQ=";
|
||||
vendorSha256 = "sha256-p/2Bu5h2P3ebgvSC12jdR2Zpd27xCFwtB/KZV0AULAM=";
|
||||
|
||||
# No tests
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xfig";
|
||||
version = "3.2.8";
|
||||
version = "3.2.8a";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mcj/xfig-${version}.tar.xz";
|
||||
sha256 = "1czamqp0xn0j6qjnasa3fjnrzi072v6qknylr6jrs4gwsfw4ybyw";
|
||||
sha256 = "0y45i1gqg3r0aq55jk047l1hnv90kqis6ld9lppx6c5jhpmc0hxs";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
pname = "octant-desktop";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
|
|
@ -15,8 +15,8 @@ let
|
|||
src = fetchurl {
|
||||
url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/Octant-${version}.${suffix}";
|
||||
sha256 = {
|
||||
x86_64-linux = "sha256-sQxplTJ3xfHELepx+t7FtMpPTxTDoqTAL8oUz4sLaW0=";
|
||||
x86_64-darwin = "sha256-ov9j+SgGXCwUjQaX3eCxVvPwPgUIwtHJ6Lmx2crOfIM=";
|
||||
x86_64-linux = "sha256-1XFb0zuyOy8XEUd9hoexItjq4assuWlWIzqw7pZxHx0=";
|
||||
x86_64-darwin = "sha256-e3v5BFX7wnx4sAQrOq+dBIDVPJYzQZKKvKjSX+dis2U=";
|
||||
}.${system};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
diff --git a/build.go b/build.go
|
||||
index c8a5c1cf..d75a8491 100644
|
||||
--- a/build.go
|
||||
+++ b/build.go
|
||||
@@ -202,6 +202,12 @@ var targets = map[string]target{
|
||||
{src: "AUTHORS", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/AUTHORS.txt", perm: 0644},
|
||||
},
|
||||
},
|
||||
+ "stcli": {
|
||||
+ name: "stcli",
|
||||
+ description: "Syncthing CLI",
|
||||
+ buildPkgs: []string{"github.com/syncthing/syncthing/cmd/stcli"},
|
||||
+ binaryName: "stcli",
|
||||
+ },
|
||||
}
|
||||
|
||||
// These are repos we need to clone to run "go generate"
|
||||
|
|
@ -3,23 +3,20 @@
|
|||
let
|
||||
common = { stname, target, postInstall ? "" }:
|
||||
buildGoModule rec {
|
||||
version = "1.14.0";
|
||||
name = "${stname}-${version}";
|
||||
pname = stname;
|
||||
version = "1.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "syncthing";
|
||||
repo = "syncthing";
|
||||
rev = "v${version}";
|
||||
sha256 = "1nkjbikin341v74fcwdaa2v5f3zhd8xr6pjhpka1fdw6vvnn4lnd";
|
||||
sha256 = "sha256-d7b1hqW0ZWg74DyW1ZYMT7sIR7H89Ph38XE2Mhh7ySg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1kr6yyigi7bbi4xwpk009q801wvmf3aaw4m40ki0s6gjn0wjl4j3";
|
||||
vendorSha256 = "sha256-00DdGJNCZ94Wj6yvVXJYNJZEiGxYbqTkX6wwon0O1tc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
patches = [
|
||||
./add-stcli-target.patch
|
||||
];
|
||||
BUILD_USER="nix";
|
||||
BUILD_HOST="nix";
|
||||
|
||||
|
|
@ -83,12 +80,6 @@ in {
|
|||
'';
|
||||
};
|
||||
|
||||
syncthing-cli = common {
|
||||
stname = "syncthing-cli";
|
||||
|
||||
target = "stcli";
|
||||
};
|
||||
|
||||
syncthing-discovery = common {
|
||||
stname = "syncthing-discovery";
|
||||
target = "stdiscosrv";
|
||||
|
|
|
|||
|
|
@ -13,17 +13,17 @@ python3.pkgs.buildPythonApplication rec {
|
|||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
Babel
|
||||
cheroot
|
||||
flaskbabel
|
||||
flask
|
||||
jinja2
|
||||
beancount
|
||||
cheroot
|
||||
click
|
||||
flask
|
||||
flaskbabel
|
||||
jaraco_functools
|
||||
jinja2
|
||||
markdown2
|
||||
ply
|
||||
simplejson
|
||||
werkzeug
|
||||
jaraco_functools
|
||||
];
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
|
|
@ -39,10 +39,11 @@ python3.pkgs.buildPythonApplication rec {
|
|||
"test_cli"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://beancount.github.io/fava";
|
||||
meta = with lib; {
|
||||
description = "Web interface for beancount";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ matthiasbeyer ];
|
||||
homepage = "https://beancount.github.io/fava";
|
||||
changelog = "https://beancount.github.io/fava/changelog.html";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bhipple ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, stdenv, gnome3, fetchFromGitHub, xprop, glib }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-unite";
|
||||
version = "48";
|
||||
version = "49";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hardpixel";
|
||||
repo = "unite-shell";
|
||||
rev = "v${version}";
|
||||
sha256 = "1rc9h7zrg9pvyl619ychcp0w7wmnf4ndaq2knv490kzhy0idj18j";
|
||||
sha256 = "12kjljw253hshaz6x886kg3mc93lb4pxwd05qihww6m5k4lqjcy5";
|
||||
};
|
||||
|
||||
uuid = "unite@hardpixel.eu";
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jasper";
|
||||
version = "2.0.26";
|
||||
version = "2.0.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jasper-software";
|
||||
repo = pname;
|
||||
rev = "version-${version}";
|
||||
hash = "sha256-zmoC8nIsQm2u2cSzu2prdyofo3JFNzJ1bjbIZ3YaAn4=";
|
||||
hash = "sha256-f3UG5w8GbwZcsFBaQN6v8kdEkKIGgizcAgaVZtKwS78=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "librsync";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "librsync";
|
||||
repo = "librsync";
|
||||
rev = "v${version}";
|
||||
sha256 = "131cd4asmpm4nskidzgiy8xibbnpibvvbq857a0pcky77min5g4z";
|
||||
sha256 = "sha256-GNwOIZ2UjvsYIthotiPDBrabYzCGFG/YVEbwVa9Nwi4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -9,6 +9,10 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1khzclkrd1yn9mz3g14ndgpsbj8j50v8dsjarcj6kkn9zgbbazc4";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./hdf5-1.12.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ hdf5 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,86 @@
|
|||
--- 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 > 12
|
||||
#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 > 12
|
||||
#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 > 12
|
||||
#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 > 12
|
||||
#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 > 12
|
||||
#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 > 12
|
||||
#error "Don't forget to change the compatibility version of the library !"
|
||||
#endif
|
||||
if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) {
|
||||
|
|
@ -5,13 +5,13 @@
|
|||
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oneDNN";
|
||||
version = "2.1.3";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oneapi-src";
|
||||
repo = "oneDNN";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xByu0HWeyDg5WV/zVO4HO/uwZ2RPrud0FlZHPfFom1E=";
|
||||
sha256 = "sha256-orsllgBt2EHuZOy9vkgDK3XT6BfbtyIPvO4REB9tAgs=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,49 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aioresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest-asyncio
|
||||
, pytest-raises
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, xmltodict
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioemonitor";
|
||||
version = "1.0.5";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0h8zqqy8v8r1fl9bp3m8icr2sy44p0mbfl1hbb0zni17r9r50dhn";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
xmltodict
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aioresponses
|
||||
pytest-asyncio
|
||||
pytest-raises
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace '"pytest-runner>=5.2",' ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "aioemonitor" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python client for SiteSage Emonitor";
|
||||
homepage = "https://github.com/bdraco/aioemonitor";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,11 +1,10 @@
|
|||
{ lib, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
, python
|
||||
, gcc10
|
||||
, cmake
|
||||
, boost172
|
||||
, boost17x
|
||||
, icu
|
||||
, swig
|
||||
, pcre
|
||||
|
|
@ -16,29 +15,21 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ifcopenshell";
|
||||
version = "0.6.0b0";
|
||||
version = "210410";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IfcOpenShell";
|
||||
repo = "IfcOpenShell";
|
||||
rev = "v${version}";
|
||||
rev = "blenderbim-${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "1ad1s9az41z2f46rbi1jnr46mgc0q4h5kz1jm9xdlwifqv9y04g1";
|
||||
sha256 = "1g52asxrqcfj01iqvf03k3bb6rg3v04hh1wc3nmn329a2lwjbxpw";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
name = "site-packages.patch";
|
||||
src = ./site-packages.patch;
|
||||
site_packages = "lib/${python.libPrefix}/site-packages";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ gcc10 cmake ];
|
||||
|
||||
buildInputs = [
|
||||
boost172
|
||||
boost17x
|
||||
icu
|
||||
pcre
|
||||
libxml2
|
||||
|
|
@ -48,7 +39,9 @@ buildPythonPackage rec {
|
|||
cd cmake
|
||||
'';
|
||||
|
||||
PYTHONUSERBASE=".";
|
||||
cmakeFlags = [
|
||||
"-DUSERSPACE_PYTHON_PREFIX=ON"
|
||||
"-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade"
|
||||
"-DOCC_LIBRARY_DIR=${opencascade-occt}/lib"
|
||||
"-DOPENCOLLADA_INCLUDE_DIR=${opencollada}/include/opencollada"
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
--- a/src/ifcwrap/CMakeLists.txt
|
||||
+++ b/src/ifcwrap/CMakeLists.txt
|
||||
@@ -68,26 +68,17 @@ endif()
|
||||
# directory in which the wrapper can be installed.
|
||||
FIND_PACKAGE(PythonInterp)
|
||||
IF(PYTHONINTERP_FOUND AND NOT "${PYTHON_EXECUTABLE}" STREQUAL "")
|
||||
- EXECUTE_PROCESS(
|
||||
- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import get_python_lib; sys.stdout.write(get_python_lib(1))"
|
||||
- OUTPUT_VARIABLE python_package_dir
|
||||
- )
|
||||
-
|
||||
- IF("${python_package_dir}" STREQUAL "")
|
||||
- MESSAGE(WARNING "Unable to locate Python site-package directory, unable to install the Python wrapper")
|
||||
- ELSE()
|
||||
FILE(GLOB_RECURSE sourcefiles "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/*.py")
|
||||
FOREACH(file ${sourcefiles})
|
||||
FILE(RELATIVE_PATH relative "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/" "${file}")
|
||||
GET_FILENAME_COMPONENT(dir "${relative}" DIRECTORY)
|
||||
INSTALL(FILES "${file}"
|
||||
- DESTINATION "${python_package_dir}/ifcopenshell/${dir}")
|
||||
+ DESTINATION "@site_packages@/ifcopenshell/${dir}")
|
||||
ENDFOREACH()
|
||||
INSTALL(FILES "${CMAKE_BINARY_DIR}/ifcwrap/ifcopenshell_wrapper.py"
|
||||
- DESTINATION "${python_package_dir}/ifcopenshell")
|
||||
+ DESTINATION "@site_packages@/ifcopenshell")
|
||||
INSTALL(TARGETS _ifcopenshell_wrapper
|
||||
- DESTINATION "${python_package_dir}/ifcopenshell")
|
||||
- ENDIF()
|
||||
+ DESTINATION "@site_packages@/ifcopenshell")
|
||||
ELSE()
|
||||
MESSAGE(WARNING "No Python interpreter found, unable to install the Python wrapper")
|
||||
ENDIF()
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, minio
|
||||
, python
|
||||
, redis
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "karton-core";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CERT-Polska";
|
||||
repo = "karton";
|
||||
rev = "v${version}";
|
||||
sha256 = "08j1bm9g58576sswcrpfczaki24nlqqaypp7qv1rxxwsyp5pq6h6";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ minio redis ];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
${python.interpreter} -m unittest discover
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Distributed malware processing framework";
|
||||
homepage = "https://karton-core.readthedocs.io/";
|
||||
maintainers = with maintainers; [ chivay ];
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
|
|
@ -38,6 +38,7 @@ assert !(MPISupport && cudaSupport) || mpi.cudatoolkit == cudatoolkit;
|
|||
assert !cudaSupport || magma.cudatoolkit == cudatoolkit;
|
||||
|
||||
let
|
||||
setBool = v: if v then "1" else "0";
|
||||
cudatoolkit_joined = symlinkJoin {
|
||||
name = "${cudatoolkit.name}-unsplit";
|
||||
# nccl is here purely for semantic grouping it could be moved to nativeBuildInputs
|
||||
|
|
@ -160,16 +161,17 @@ in buildPythonPackage rec {
|
|||
# Use pytorch's custom configurations
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
BUILD_NAMEDTENSOR = true;
|
||||
BUILD_DOCS = buildDocs;
|
||||
BUILD_NAMEDTENSOR = setBool true;
|
||||
BUILD_DOCS = setBool buildDocs;
|
||||
|
||||
USE_MKL = blas.implementation == "mkl";
|
||||
# We only do an imports check, so do not build tests either.
|
||||
BUILD_TEST = setBool false;
|
||||
|
||||
# Unlike MKL, oneDNN (née MKLDNN) is FOSS, so we enable support for
|
||||
# it by default. PyTorch currently uses its own vendored version
|
||||
# of oneDNN through Intel iDeep.
|
||||
USE_MKLDNN = mklDnnSupport;
|
||||
USE_MKLDNN_CBLAS = mklDnnSupport;
|
||||
USE_MKLDNN = setBool mklDnnSupport;
|
||||
USE_MKLDNN_CBLAS = setBool mklDnnSupport;
|
||||
|
||||
preBuild = ''
|
||||
export MAX_JOBS=$NIX_BUILD_CORES
|
||||
|
|
@ -198,7 +200,7 @@ in buildPythonPackage rec {
|
|||
PYTORCH_BUILD_VERSION = version;
|
||||
PYTORCH_BUILD_NUMBER = 0;
|
||||
|
||||
USE_SYSTEM_NCCL=useSystemNccl; # don't build pytorch's third_party NCCL
|
||||
USE_SYSTEM_NCCL=setBool useSystemNccl; # don't build pytorch's third_party NCCL
|
||||
|
||||
# Suppress a weird warning in mkl-dnn, part of ideep in pytorch
|
||||
# (upstream seems to have fixed this in the wrong place?)
|
||||
|
|
|
|||
|
|
@ -12,19 +12,28 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "twilio";
|
||||
version = "6.51.1";
|
||||
version = "6.56.0";
|
||||
|
||||
|
||||
# tests not included in PyPi, so fetch from github instead
|
||||
src = fetchFromGitHub {
|
||||
owner = "twilio";
|
||||
repo = "twilio-python";
|
||||
rev = version;
|
||||
sha256 = "sha256-OHtmUFm/9GkpIzz0DdSdlHyBFRIgu8GxQ4S4VMJik9o=";
|
||||
sha256 = "sha256-vVJuuPxVyOqnplPYrjCjIm5IyIFZvsCMoDLrrHpHK+4=";
|
||||
};
|
||||
|
||||
buildInputs = [ nose mock ];
|
||||
propagatedBuildInputs = [
|
||||
pyjwt
|
||||
pysocks
|
||||
pytz
|
||||
requests
|
||||
six
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ pyjwt pysocks pytz six requests ];
|
||||
checkInputs = [
|
||||
mock
|
||||
nose
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "twilio" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
|
|
@ -9,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "wakeonlan";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -17,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "remcohaszing";
|
||||
repo = "pywakeonlan";
|
||||
rev = version;
|
||||
sha256 = "0p9jyiv0adcymbnmbay72g9phlbhsr4kmrwxscbdjq81gcmxsi0y";
|
||||
sha256 = "sha256-WgoL8ntfEaHcvVbJjdewe0wE31Lq7WBj8Bppeq1uJx8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -28,15 +27,6 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Switch to poetry-core, https://github.com/remcohaszing/pywakeonlan/pull/19
|
||||
(fetchpatch {
|
||||
name = "switch-to-poetry-core.patch";
|
||||
url = "https://github.com/remcohaszing/pywakeonlan/commit/6aa5050ed94ef718dfcd0b946546b6a738f47ee3.patch";
|
||||
sha256 = "1xzj2464ziwm7bp05bzbjwjp9whmgp1py3isr41d92qvnil86vm6";
|
||||
})
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "test_wakeonlan.py" ];
|
||||
|
||||
pythonImportsCheck = [ "wakeonlan" ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "air";
|
||||
version = "1.15.1";
|
||||
version = "1.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cosmtrek";
|
||||
repo = "air";
|
||||
rev = "v${version}";
|
||||
sha256 = "0d34k8hyag84j24bhax4gvg8mkzqyhdqd16rfirpfjiqvqh0vdkz";
|
||||
sha256 = "sha256-on9Rb+QGFWx7/k9xD+tcaPu6YNaBBkFBHHMSWJbZpWM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0k28rxnd0vyb6ljbi83bm1gl7j4r660a3ckjxnzc2qzwvfj69g53";
|
||||
vendorSha256 = "sha256-B7AgUFjiW3P1dU88u3kswbCQJ7Qq7rgPlX+b+3Pq1L4=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "cutter";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rizinorg";
|
||||
repo = "cutter";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uIN/NR+swu9Ie0wP2aBhw5WBvTe9NDmzSs+lQMCeavc=";
|
||||
sha256 = "sha256-IQCJOUgefSdMSa27E6I/CL35Kx5pHq/u+5Q0FHUAR1E=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -18,29 +18,42 @@
|
|||
, ninja
|
||||
, capstone
|
||||
, tree-sitter
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rizin";
|
||||
version = "0.1.2";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-${version}.tar.xz";
|
||||
sha256 = "sha256-npUp8wJiKAaQKSigXtndhJLTJ4+pyFqa0FwDLBqR/sE=";
|
||||
url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz";
|
||||
sha256 = "sha256-CGHeo247syha+rVtiAQz0XkEYK9p4DHTnLK2FhBOvE8=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
"-Duse_sys_capstone=true"
|
||||
"-Duse_sys_magic=true"
|
||||
"-Duse_sys_libzip=true"
|
||||
"-Duse_sys_zlib=true"
|
||||
"-Duse_sys_xxhash=true"
|
||||
"-Duse_sys_lz4=true"
|
||||
"-Duse_sys_openssl=true"
|
||||
"-Duse_sys_tree_sitter=true"
|
||||
"-Duse_sys_capstone=enabled"
|
||||
"-Duse_sys_magic=enabled"
|
||||
"-Duse_sys_libzip=enabled"
|
||||
"-Duse_sys_zlib=enabled"
|
||||
"-Duse_sys_xxhash=enabled"
|
||||
"-Duse_sys_lz4=enabled"
|
||||
"-Duse_sys_openssl=enabled"
|
||||
"-Duse_sys_tree_sitter=enabled"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja cmake ];
|
||||
nativeBuildInputs = [ pkg-config meson ninja cmake (python3.withPackages (ps: [ ps.setuptools ])) ];
|
||||
|
||||
# meson's find_library seems to not use our compiler wrapper if static paraemter
|
||||
# is either true/false... We work around by also providing LIBRARY_PATH
|
||||
preConfigure = ''
|
||||
LIBRARY_PATH=""
|
||||
for b in ${toString (map lib.getLib buildInputs)}; do
|
||||
if [[ -d "$b/lib" ]]; then
|
||||
LIBRARY_PATH="$b/lib''${LIBRARY_PATH:+:}$LIBRARY_PATH"
|
||||
fi
|
||||
done
|
||||
export LIBRARY_PATH
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
file
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, stdenv
|
||||
, fetchgit
|
||||
, wrapLisp
|
||||
, sbcl
|
||||
, sbcl_2_0_9
|
||||
, openssl
|
||||
}:
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
buildInputs = [
|
||||
(wrapLisp sbcl)
|
||||
(wrapLisp sbcl_2_0_9)
|
||||
openssl
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "github-commenter";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudposse";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "HgiCgyig+49g275G6zZ0kGTxt1TSfFK8kt+SOf4ei74=";
|
||||
sha256 = "sha256-IBo4FAoYX1FmrmQ9mlyyu1TGLY7dlH7pWalBoRb2puE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "Gw+cR5sA5MGuclcvur8olmRtK04LDP5vKJ5k7yZO3B0=";
|
||||
vendorSha256 = "sha256-H1SnNG+/ALYs7h/oT8zWBhAXOuCFY0Sto2ATBBZg2ek=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line utility for creating GitHub comments on Commits, Pull Request Reviews or Issues";
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ buildDunePackage rec {
|
|||
version = "1.8.2";
|
||||
pname = "ocp-indent";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/OCamlPro/ocp-indent/archive/${version}.tar.gz";
|
||||
sha256 = "1dvcl108ir9nqkk4mjm9xhhj4p9dx9bmg8bnms54fizs1x3x8ar3";
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
let
|
||||
pname = "anki-bin";
|
||||
# Update hashes for both Linux and Darwin!
|
||||
version = "2.1.40";
|
||||
version = "2.1.43";
|
||||
|
||||
unpacked = stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux.tar.bz2";
|
||||
sha256 = "0zcvjm0dv3mjln2npv415yfaa1fykif738qkis52x3pq1by2aiam";
|
||||
sha256 = "0kadv3fxi76h7xxmb4lckkgcwiv0b7cn630l62dxa2abxibans29";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
@ -49,7 +49,7 @@ if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac.dmg";
|
||||
sha256 = "14f0sp9h963qix4wa0kg7z8a2nhch9aybv736rm55aqk6mady6vi";
|
||||
sha256 = "0vvgiybq1ygq7cly1r4ircgzg2cpprindr7nnlbnrmandjy2kw49";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, SDL2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yapesdl";
|
||||
version = "0.70.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "calmopyrin";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-51P6wNaSfVA3twu+yRUKXguEmVBvuuEnHxH1Zl1vsCc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
SDL2
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install --directory $out/bin $out/share/doc/$pname
|
||||
install yapesdl $out/bin/
|
||||
install README.SDL $out/share/doc/$pname/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://yape.plus4.net/";
|
||||
description = "Multiplatform Commodore 64 and 264 family emulator";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.11.12";
|
||||
version = "5.11.13";
|
||||
suffix = "xanmod1-cacule";
|
||||
in
|
||||
buildLinux (args // rec {
|
||||
|
|
@ -12,7 +12,7 @@ in
|
|||
owner = "xanmod";
|
||||
repo = "linux";
|
||||
rev = modDirVersion;
|
||||
sha256 = "sha256-omRZ9oAmW3mauUolPf/lgMFMwUCYU4YaZ+OS75Ag+lM=";
|
||||
sha256 = "sha256-LUbkccAfDS0/FnNhHn64bkC8qwBD0NKcdZRzNoSw4uA=";
|
||||
extraPostFetch = ''
|
||||
rm $out/.config
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "promscale";
|
||||
version = "0.2.1";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timescale";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-f/fpCyAw9BQ6ccEZm/xsTCjINjFtX3Q6SmPuJNVSJVI=";
|
||||
sha256 = "sha256-kZYFOuY6FFM35mP+o/YU5SM5H9ziOq9BQ8T1RX7rhGE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-/woSbtrOI3BVBhh+A2kO1CB1BLzBciwOqvSbGkFeMEU=";
|
||||
vendorSha256 = "sha256-1VOhDOfFE4BpDR4XfhLoXJFuTDkG1nx88tVvTF3ZVxU=";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/promscale/pkg/version.Version=${version} -X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "rtsp-simple-server";
|
||||
version = "0.15.3";
|
||||
version = "0.15.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aler9";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eY3XtGmHp7TM+lXC9tdd51x7sLuuZfBDJxTZ79Ye0Qs=";
|
||||
sha256 = "sha256-6XdX4HEjDRt9WtqyHIv/NLt7IytNDeJLgCeTHTGybRI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-SiWcOI1XxrwwTAzp8HC5zOO5e2oSWBMFRYsW2RwPA5I=";
|
||||
vendorSha256 = "sha256-T5LWbxYsKnG5eaYLR/rms6+2DXv2lV9o39BvF7HapZY=";
|
||||
|
||||
# Tests need docker
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -1,36 +1,25 @@
|
|||
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gtk3, epoxy, wayland, wrapGAppsHook
|
||||
, fetchpatch
|
||||
}:
|
||||
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gtk3, epoxy, wayland, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wdisplays";
|
||||
version = "1.0";
|
||||
version = "unstable-2021-04-03";
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ];
|
||||
|
||||
buildInputs = [ gtk3 epoxy wayland ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cyclopsian";
|
||||
owner = "luispabon";
|
||||
repo = "wdisplays";
|
||||
rev = version;
|
||||
sha256 = "1xhgrcihja2i7yg54ghbwr1v6kf8jnsfcp364yb97vkxskc4y21y";
|
||||
rev = "7f2eac0d2aa81b5f495da7950fd5a94683f7868e";
|
||||
sha256 = "sha256-cOF3+T34zPro58maWUouGG+vlLm2C5NfcH7PZhSvApE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes `Gdk-Message: 10:26:38.752: Error reading events from display: Success`
|
||||
# https://github.com/cyclopsian/wdisplays/pull/20
|
||||
(fetchpatch {
|
||||
url = "https://github.com/cyclopsian/wdisplays/commit/5198a9c94b40ff157c284df413be5402f1b75118.patch";
|
||||
sha256 = "1xwphyn0ksf8isy9dz3mfdhmsz4jv02870qz5615zs7aqqfcwn85";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A graphical application for configuring displays in Wayland compositors";
|
||||
homepage = "https://github.com/cyclopsian/wdisplays";
|
||||
maintainers = with lib.maintainers; [ lheckemann ma27 ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
homepage = "https://github.com/luispabon/wdisplays";
|
||||
maintainers = with maintainers; [ lheckemann ma27 ];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "shadowsocks-rust";
|
||||
version = "1.10.3";
|
||||
version = "1.10.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "shadowsocks";
|
||||
repo = pname;
|
||||
sha256 = "1ds2270pw187hbg01lcqxw0631m0ypvbza47z5ndgn6dxprga9wk";
|
||||
sha256 = "0nagn7792qniczzv0912h89bn8rm8hyikdiw7cqwknx0hw8dwz1z";
|
||||
};
|
||||
|
||||
cargoSha256 = "0aarhv78ab3z893cgiixxjpxl6xcwi96saavnzw4zd68988lb24r";
|
||||
cargoSha256 = "0arqc0wnvfkmk8xzsdc6fvd1adazrw950ld8xyh7r588pyphjmhn";
|
||||
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +1,14 @@
|
|||
{ lib, stdenv, fetchurl, libpcap, perl, fetchpatch }:
|
||||
{ lib, stdenv, fetchurl, libpcap, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tcpdump";
|
||||
version = "4.9.3";
|
||||
version = "4.99.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.tcpdump.org/release/${pname}-${version}.tar.gz";
|
||||
sha256 = "0434vdcnbqaia672rggjzdn4bb8p8dchz559yiszzdk0sjrprm1c";
|
||||
sha256 = "0hmqh2fx8rgs9v1mk3vpywj61xvkifz260q685xllxr8jmxg3wlc";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Patch for CVE-2020-8037
|
||||
(fetchpatch {
|
||||
url = "https://github.com/the-tcpdump-group/tcpdump/commit/32027e199368dad9508965aae8cd8de5b6ab5231.patch";
|
||||
sha256 = "sha256-bO3aV032ru9+M/9isBRjmH8jTZLKj9Zf9ha2rmOaZwc=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs tests
|
||||
'';
|
||||
|
|
@ -29,11 +21,11 @@ stdenv.mkDerivation rec {
|
|||
(stdenv.hostPlatform != stdenv.buildPlatform)
|
||||
"ac_cv_linux_vers=2";
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Network sniffer";
|
||||
homepage = "http://www.tcpdump.org/";
|
||||
license = "BSD-style";
|
||||
maintainers = with lib.maintainers; [ globin ];
|
||||
platforms = lib.platforms.unix;
|
||||
homepage = "https://www.tcpdump.org/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ globin ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git i/setup.py w/setup.py
|
||||
index cfe2665..5795874 100755
|
||||
--- i/setup.py
|
||||
+++ w/setup.py
|
||||
@@ -179,7 +179,7 @@ class build_ext(_build_ext):
|
||||
driver_build_function = self._build_win_driver
|
||||
self._build_win_compression()
|
||||
|
||||
- if not self.skip_driver:
|
||||
+ if True:
|
||||
driver_build_function()
|
||||
|
||||
def get_source_files(self):
|
||||
|
|
@ -1,29 +1,54 @@
|
|||
{ stdenv, lib, fetchFromGitHub, python2Packages, nasm, libelf
|
||||
, kernel ? null, withDriver ? false }:
|
||||
python2Packages.buildPythonApplication rec {
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, kernel ? null
|
||||
, libelf
|
||||
, nasm
|
||||
, python3
|
||||
, withDriver ? false
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "chipsec";
|
||||
version = "1.5.1";
|
||||
version = "1.6.1";
|
||||
disabled = !stdenv.isLinux;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chipsec";
|
||||
repo = "chipsec";
|
||||
rev = version;
|
||||
sha256 = "1rxr9i08a22m15slvlkrhnki30jixi2ds096kmmc2nqzfr9yibmb";
|
||||
sha256 = "01sp24z63r3nqxx57zc4873b8i5dqipy7yrxzrwjns531vznhiy2";
|
||||
};
|
||||
|
||||
disabled = !stdenv.isLinux;
|
||||
patches = lib.optionals withDriver [ ./ko-path.diff ./compile-ko.diff ];
|
||||
|
||||
KSRC = lib.optionalString withDriver "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
|
||||
|
||||
nativeBuildInputs = [
|
||||
nasm libelf
|
||||
libelf
|
||||
nasm
|
||||
];
|
||||
|
||||
setupPyBuildFlags = lib.optional (!withDriver) "--skip-driver";
|
||||
checkInputs = [
|
||||
python3.pkgs.distro
|
||||
python3.pkgs.pytestCheckHook
|
||||
];
|
||||
|
||||
checkPhase = "python setup.py build "
|
||||
+ lib.optionalString (!withDriver) "--skip-driver "
|
||||
+ "test";
|
||||
preBuild = lib.optionalString withDriver ''
|
||||
export CHIPSEC_BUILD_LIB=$(mktemp -d)
|
||||
mkdir -p $CHIPSEC_BUILD_LIB/chipsec/helper/linux
|
||||
'';
|
||||
|
||||
KERNEL_SRC_DIR = lib.optionalString withDriver "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
|
||||
preInstall = lib.optionalString withDriver ''
|
||||
mkdir -p $out/${python3.pkgs.python.sitePackages}/drivers/linux
|
||||
mv $CHIPSEC_BUILD_LIB/chipsec/helper/linux/chipsec.ko \
|
||||
$out/${python3.pkgs.python.sitePackages}/drivers/linux/chipsec.ko
|
||||
'';
|
||||
|
||||
setupPyBuildFlags = [ "--build-lib=$CHIPSEC_BUILD_LIB" ]
|
||||
++ lib.optional (!withDriver) "--skip-driver";
|
||||
|
||||
pythonImportsCheck = [ "chipsec" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Platform Security Assessment Framework";
|
||||
|
|
@ -34,7 +59,7 @@ python2Packages.buildPythonApplication rec {
|
|||
interfaces, and forensic capabilities. It can be run on Windows, Linux,
|
||||
Mac OS X and UEFI shell.
|
||||
'';
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Only;
|
||||
homepage = "https://github.com/chipsec/chipsec";
|
||||
maintainers = with maintainers; [ johnazoidberg ];
|
||||
platforms = if withDriver then [ "x86_64-linux" ] else platforms.all;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git c/chipsec/helper/linux/linuxhelper.py i/chipsec/helper/linux/linuxhelper.py
|
||||
index c51b5e6..4be05ea 100644
|
||||
--- c/chipsec/helper/linux/linuxhelper.py
|
||||
+++ i/chipsec/helper/linux/linuxhelper.py
|
||||
@@ -152,7 +152,7 @@ class LinuxHelper(Helper):
|
||||
else:
|
||||
a2 = "a2=0x{}".format(phys_mem_access_prot)
|
||||
|
||||
- driver_path = os.path.join(chipsec.file.get_main_dir(), "chipsec", "helper", "linux", "chipsec.ko" )
|
||||
+ driver_path = os.path.join(chipsec.file.get_main_dir(), "drivers", "linux", "chipsec.ko" )
|
||||
if not os.path.exists(driver_path):
|
||||
driver_path += ".xz"
|
||||
if not os.path.exists(driver_path):
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, wireshark-cli
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "hfinger";
|
||||
version = "0.2.0";
|
||||
disabled = python3.pythonOlder "3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CERT-Polska";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1vz8mf572qyng684fvb9gdwaaiybk7mjmikbymvjvy24d10raak1";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
fnvhash
|
||||
python_magic
|
||||
] ++ [
|
||||
wireshark-cli
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "hfinger" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fingerprinting tool for HTTP requests";
|
||||
homepage = "https://github.com/CERT-Polska/hfinger";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -729,6 +729,7 @@ mapAliases ({
|
|||
sup = throw "sup was deprecated on 2019-09-10: abandoned by upstream";
|
||||
swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23
|
||||
swtpm-tpm2 = swtpm; # added 2021-02-26
|
||||
syncthing-cli = syncthing; # added 2021-04-06
|
||||
system_config_printer = system-config-printer; # added 2016-01-03
|
||||
systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # added 2020-07-12
|
||||
systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # added 2020-07-12
|
||||
|
|
|
|||
|
|
@ -5491,6 +5491,8 @@ in
|
|||
|
||||
idle3tools = callPackage ../tools/system/idle3tools { };
|
||||
|
||||
ifcopenshell = with python3Packages; toPythonApplication ifcopenshell;
|
||||
|
||||
iftop = callPackage ../tools/networking/iftop { };
|
||||
|
||||
ifuse = callPackage ../tools/filesystems/ifuse { };
|
||||
|
|
@ -6029,7 +6031,9 @@ in
|
|||
inherit (python3Packages) ansi2html;
|
||||
};
|
||||
|
||||
medfile = callPackage ../development/libraries/medfile { };
|
||||
medfile = callPackage ../development/libraries/medfile {
|
||||
hdf5 = hdf5.override { usev110Api = true; };
|
||||
};
|
||||
|
||||
meilisearch = callPackage ../servers/search/meilisearch {
|
||||
inherit (darwin.apple_sdk.frameworks) IOKit Security;
|
||||
|
|
@ -14758,6 +14762,8 @@ in
|
|||
|
||||
hdt = callPackage ../misc/hdt {};
|
||||
|
||||
hfinger = callPackage ../tools/security/hfinger { };
|
||||
|
||||
herqq = libsForQt5.callPackage ../development/libraries/herqq { };
|
||||
|
||||
hidapi = callPackage ../development/libraries/hidapi {
|
||||
|
|
@ -25880,7 +25886,6 @@ in
|
|||
|
||||
inherit (callPackages ../applications/networking/syncthing { })
|
||||
syncthing
|
||||
syncthing-cli
|
||||
syncthing-discovery
|
||||
syncthing-relay;
|
||||
|
||||
|
|
@ -30575,6 +30580,8 @@ in
|
|||
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL OpenAL;
|
||||
};
|
||||
|
||||
yapesdl = callPackage ../misc/emulators/yapesdl { };
|
||||
|
||||
x16-emulator = callPackage ../misc/emulators/commander-x16/emulator.nix { };
|
||||
x16-rom = callPackage ../misc/emulators/commander-x16/rom.nix { };
|
||||
|
||||
|
|
|
|||
|
|
@ -245,6 +245,8 @@ in {
|
|||
|
||||
aioeafm = callPackage ../development/python-modules/aioeafm { };
|
||||
|
||||
aioemonitor = callPackage ../development/python-modules/aioemonitor { };
|
||||
|
||||
aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { };
|
||||
|
||||
aioeventlet = callPackage ../development/python-modules/aioeventlet { };
|
||||
|
|
@ -3665,6 +3667,8 @@ in {
|
|||
|
||||
kaptan = callPackage ../development/python-modules/kaptan { };
|
||||
|
||||
karton-core = callPackage ../development/python-modules/karton-core { };
|
||||
|
||||
kazoo = callPackage ../development/python-modules/kazoo { };
|
||||
|
||||
kconfiglib = callPackage ../development/python-modules/kconfiglib { };
|
||||
|
|
|
|||
Loading…
Reference in New Issue