Martin Weinelt
2 years ago
commit
48f17360d9
@ -0,0 +1,21 @@ |
||||
{ lib, ... }: |
||||
let |
||||
inherit (lib) mkOption types; |
||||
in |
||||
{ |
||||
options = { |
||||
|
||||
system.build = mkOption { |
||||
default = {}; |
||||
description = '' |
||||
Attribute set of derivations used to set up the system. |
||||
''; |
||||
type = types.submoduleWith { |
||||
modules = [{ |
||||
freeformType = with types; lazyAttrsOf (uniq unspecified); |
||||
}]; |
||||
}; |
||||
}; |
||||
|
||||
}; |
||||
} |
||||
@ -0,0 +1,22 @@ |
||||
{ stdenv, lib, fetchFromGitHub, cmake, bash-completion, pkg-config, libconfig, autoreconfHook }: |
||||
stdenv.mkDerivation { |
||||
pname = "libusbgx"; |
||||
version = "unstable-2021-10-31"; |
||||
src = fetchFromGitHub { |
||||
owner = "linux-usb-gadgets"; |
||||
repo = "libusbgx"; |
||||
rev = "060784424609d5a4e3bce8355f788c93f09802a5"; |
||||
sha256 = "172qh8gva17jr18ldhf9zi960w2bqzmp030w6apxq57c9nv6d8k7"; |
||||
}; |
||||
nativeBuildInputs = [ autoreconfHook pkg-config ]; |
||||
buildInputs = [ libconfig ]; |
||||
meta = { |
||||
description = "C library encapsulating the kernel USB gadget-configfs userspace API functionality"; |
||||
license = with lib.licenses; [ |
||||
lgpl21Plus # library |
||||
gpl2Plus # examples |
||||
]; |
||||
maintainers = with lib.maintainers; [ lheckemann ]; |
||||
platforms = lib.platforms.linux; |
||||
}; |
||||
} |
||||
@ -0,0 +1,78 @@ |
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index fa84a54c..3d790e1c 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -57,9 +57,9 @@ checksum = "be4dc07131ffa69b8072d35f5007352af944213cde02545e2103680baed38fcd"
|
||||
|
||||
[[package]]
|
||||
name = "arrow"
|
||||
-version = "6.0.0"
|
||||
+version = "6.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "337e668497751234149fd607f5cb41a6ae7b286b6329589126fe67f0ac55d637"
|
||||
+checksum = "216c6846a292bdd93c2b93c1baab58c32ff50e2ab5e8d50db333ab518535dd8b"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"chrono",
|
||||
@@ -212,9 +212,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "comfy-table"
|
||||
-version = "4.1.1"
|
||||
+version = "5.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "11e95a3e867422fd8d04049041f5671f94d53c32a9dcd82e2be268714942f3f3"
|
||||
+checksum = "c42350b81f044f576ff88ac750419f914abb46a03831bb1747134344ee7a4e64"
|
||||
dependencies = [
|
||||
"strum",
|
||||
"strum_macros",
|
||||
@@ -279,7 +279,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "datafusion"
|
||||
-version = "5.1.0"
|
||||
+version = "6.0.0"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"arrow",
|
||||
@@ -310,7 +310,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "datafusion-python"
|
||||
-version = "0.3.0"
|
||||
+version = "0.4.0"
|
||||
dependencies = [
|
||||
"datafusion",
|
||||
"pyo3",
|
||||
@@ -877,9 +877,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "parquet"
|
||||
-version = "6.0.0"
|
||||
+version = "6.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "d263b9b59ba260518de9e57bd65931c3f765fea0fabacfe84f40d6fde38e841a"
|
||||
+checksum = "788d9953f4cfbe9db1beff7bebd54299d105e34680d78b82b1ddc85d432cac9d"
|
||||
dependencies = [
|
||||
"arrow",
|
||||
"base64",
|
||||
@@ -1228,15 +1228,15 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
|
||||
|
||||
[[package]]
|
||||
name = "strum"
|
||||
-version = "0.21.0"
|
||||
+version = "0.22.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2"
|
||||
+checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e"
|
||||
|
||||
[[package]]
|
||||
name = "strum_macros"
|
||||
-version = "0.21.1"
|
||||
+version = "0.22.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec"
|
||||
+checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
@ -0,0 +1,90 @@ |
||||
{ lib |
||||
, stdenv |
||||
, fetchurl |
||||
, buildPythonPackage |
||||
, fetchPypi |
||||
, fetchFromGitHub |
||||
, rustPlatform |
||||
, maturin |
||||
, pytestCheckHook |
||||
, libiconv |
||||
, numpy |
||||
, pandas |
||||
, pyarrow |
||||
, pytest |
||||
}: |
||||
let |
||||
# le sigh, the perils of unrelated versions of software living in the same |
||||
# repo: there's no obvious way to map the top level source repo |
||||
# (arrow-datafusion) version to the version of contained repo |
||||
# (arrow-datafusion/python) |
||||
# |
||||
# A commit hash will do in a pinch, and ultimately the sha256 has the final |
||||
# say of what the content is when building |
||||
cargoLock = fetchurl { |
||||
url = "https://raw.githubusercontent.com/apache/arrow-datafusion/6.0.0/python/Cargo.lock"; |
||||
sha256 = "sha256-xiv3drEU5jOGsEIh0U01ZQ1NBKobxO2ctp4mxy9iigw="; |
||||
}; |
||||
|
||||
postUnpack = '' |
||||
cp "${cargoLock}" $sourceRoot/Cargo.lock |
||||
chmod u+w $sourceRoot/Cargo.lock |
||||
''; |
||||
in |
||||
buildPythonPackage rec { |
||||
pname = "datafusion"; |
||||
version = "0.4.0"; |
||||
format = "pyproject"; |
||||
|
||||
src = fetchPypi { |
||||
inherit pname version; |
||||
sha256 = "sha256-+YqogteKfNhtI2QbVXv/5CIWm3PcOH653dwONm5ZcL8="; |
||||
}; |
||||
|
||||
inherit postUnpack; |
||||
|
||||
# TODO: remove the patch hacking and postUnpack hooks after |
||||
# https://github.com/apache/arrow-datafusion/pull/1508 is merged |
||||
# |
||||
# the lock file isn't up to date as of 6.0.0 so we need to patch the source |
||||
# lockfile and the vendored cargo deps lockfile |
||||
patches = [ ./Cargo.lock.patch ]; |
||||
cargoDeps = rustPlatform.fetchCargoTarball { |
||||
inherit src pname version postUnpack; |
||||
sha256 = "sha256-JGyDxpfBXzduJaMF1sbmRm7KJajHYdVSj+WbiSETiY0="; |
||||
patches = [ ./Cargo.lock.patch ]; |
||||
}; |
||||
|
||||
nativeBuildInputs = with rustPlatform; [ |
||||
cargoSetupHook |
||||
maturinBuildHook |
||||
]; |
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; |
||||
|
||||
propagatedBuildInputs = [ |
||||
numpy |
||||
pandas |
||||
pyarrow |
||||
]; |
||||
|
||||
checkInputs = [ pytest ]; |
||||
pythonImportsCheck = [ "datafusion" ]; |
||||
|
||||
checkPhase = '' |
||||
runHook preCheck |
||||
pytest --pyargs "${pname}" |
||||
runHook postCheck |
||||
''; |
||||
|
||||
meta = with lib; { |
||||
description = "Extensible query execution framework"; |
||||
longDescription = '' |
||||
DataFusion is an extensible query execution framework, written in Rust, |
||||
that uses Apache Arrow as its in-memory format. |
||||
''; |
||||
homepage = "https://arrow.apache.org/datafusion/"; |
||||
license = with licenses; [ asl20 ]; |
||||
maintainers = with maintainers; [ cpcloud ]; |
||||
}; |
||||
} |
||||
@ -1,19 +1,34 @@ |
||||
{ lib, buildPythonPackage, fetchPypi, six }: |
||||
{ lib |
||||
, buildPythonPackage |
||||
, fetchPypi |
||||
, six |
||||
, pythonOlder |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "jdatetime"; |
||||
version = "3.8.0"; |
||||
version = "3.8.1"; |
||||
format = "setuptools"; |
||||
|
||||
disabled = pythonOlder "3.7"; |
||||
|
||||
src = fetchPypi { |
||||
inherit pname version; |
||||
sha256 = "389a0723a8011379a5e34386ec466cb3f65b2d5cb5422702c1d3aecb6ac192d0"; |
||||
sha256 = "db57ee517356b1bfc1603ef412f5da61eae92241ba0bcaf0851028cae424780c"; |
||||
}; |
||||
|
||||
propagatedBuildInputs = [ six ]; |
||||
propagatedBuildInputs = [ |
||||
six |
||||
]; |
||||
|
||||
pythonImportsCheck = [ |
||||
"jdatetime" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
description = "Jalali datetime binding for python"; |
||||
homepage = "https://pypi.python.org/pypi/jdatetime"; |
||||
description = "Jalali datetime binding"; |
||||
homepage = "https://github.com/slashmili/python-jalali"; |
||||
license = licenses.psfl; |
||||
maintainers = with maintainers; [ ]; |
||||
}; |
||||
} |
||||
|
||||
@ -0,0 +1,40 @@ |
||||
{ lib |
||||
, stdenv |
||||
, fetchFromGitHub |
||||
, texlive |
||||
}: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "sagetex"; |
||||
version = "3.6"; |
||||
passthru.tlType = "run"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "sagemath"; |
||||
repo = "sagetex"; |
||||
rev = "v${version}"; |
||||
sha256 = "8iHcJbaY/dh0vmvYyd6zj1ZbuJRaJGb6bUBK1v4gXWU="; |
||||
}; |
||||
|
||||
buildInputs = [ |
||||
texlive.combined.scheme-basic |
||||
]; |
||||
|
||||
buildPhase = '' |
||||
make sagetex.sty |
||||
''; |
||||
|
||||
installPhase = '' |
||||
path="$out/tex/latex/sagetex" |
||||
mkdir -p "$path" |
||||
cp -va *.sty *.cfg *.def "$path/" |
||||
''; |
||||
|
||||
meta = with lib; { |
||||
description = "Embed code, results of computations, and plots from Sage into LaTeX documents"; |
||||
homepage = "https://github.com/sagemath/sagetex"; |
||||
license = licenses.gpl2Plus; |
||||
maintainers = with maintainers; [ alexnortung ]; |
||||
platforms = platforms.all; |
||||
}; |
||||
} |
||||
@ -0,0 +1,29 @@ |
||||
{ stdenv, lib, fetchFromGitHub, cmake, bash-completion, pkg-config, libconfig |
||||
, asciidoc |
||||
, libusbgx |
||||
}: |
||||
stdenv.mkDerivation { |
||||
pname = "gt"; |
||||
version = "unstable-2021-09-30"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "linux-usb-gadgets"; |
||||
repo = "gt"; |
||||
rev = "7247547a14b2d092dc03fd83218ae65c2f7ff7d6"; |
||||
sha256 = "1has9q2sghd5vyi25l3h2hd4d315vvpld076iwwsg01fx4d9vjmg"; |
||||
}; |
||||
sourceRoot = "source"; |
||||
|
||||
preConfigure = '' |
||||
cmakeFlagsArray+=("-DBASH_COMPLETION_COMPLETIONSDIR=$out/share/bash-completions/completions") |
||||
''; |
||||
nativeBuildInputs = [ cmake pkg-config asciidoc ]; |
||||
buildInputs = [ bash-completion libconfig libusbgx]; |
||||
|
||||
meta = { |
||||
description = "Linux command line tool for setting up USB gadgets using configfs"; |
||||
license = with lib.licenses; [ asl20 ]; |
||||
maintainers = with lib.maintainers; [ lheckemann ]; |
||||
platforms = lib.platforms.linux; |
||||
}; |
||||
} |
||||
@ -1,73 +0,0 @@ |
||||
commit 6aea54d2ad2287b3e8894c262ee895f3d4a60516
|
||||
Author: André Draszik <git@andred.net>
|
||||
Date: Mon Oct 17 12:45:32 2016 +0100
|
||||
|
||||
evmctl: use correct include for xattr.h
|
||||
|
||||
The xattr API/ABI is provided by both the c-library, as well as by the
|
||||
libattr package. The c-library's header file is sys/xattr.h, whereas
|
||||
libattr's header file can be found in attr/xattr.h.
|
||||
|
||||
Given none of the code here *links* against the libattr.so shared library, it
|
||||
is wrong to *compile* against libattr's API (header file).
|
||||
|
||||
Doing so avoids confusion as to which xattr.h is used as the least problem,
|
||||
and potential ABI differences as the worst problem due the mismatching header
|
||||
file used.
|
||||
|
||||
So make sure we compile and link against the same thing, the c-library in
|
||||
both cases.
|
||||
|
||||
Signed-off-by: André Draszik <git@andred.net>
|
||||
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 0497eb7..a5b4288 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -30,7 +30,7 @@ AC_SUBST(OPENSSL_LIBS)
|
||||
AC_CHECK_HEADER(unistd.h)
|
||||
AC_CHECK_HEADERS(openssl/conf.h)
|
||||
|
||||
-AC_CHECK_HEADERS(attr/xattr.h, , [AC_MSG_ERROR([attr/xattr.h header not found. You need the libattr development package.])])
|
||||
+AC_CHECK_HEADERS(sys/xattr.h, , [AC_MSG_ERROR([sys/xattr.h header not found. You need the c-library development package.])])
|
||||
AC_CHECK_HEADERS(keyutils.h, , [AC_MSG_ERROR([keyutils.h header not found. You need the libkeyutils development package.])])
|
||||
|
||||
#debug support - yes for a while
|
||||
diff --git a/packaging/ima-evm-utils.spec b/packaging/ima-evm-utils.spec
|
||||
index a11a27a..63388d2 100644
|
||||
--- a/packaging/ima-evm-utils.spec
|
||||
+++ b/packaging/ima-evm-utils.spec
|
||||
@@ -11,7 +11,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: openssl-devel
|
||||
-BuildRequires: libattr-devel
|
||||
BuildRequires: keyutils-libs-devel
|
||||
|
||||
%description
|
||||
diff --git a/packaging/ima-evm-utils.spec.in b/packaging/ima-evm-utils.spec.in
|
||||
index 7ca6c6f..65c32f9 100644
|
||||
--- a/packaging/ima-evm-utils.spec.in
|
||||
+++ b/packaging/ima-evm-utils.spec.in
|
||||
@@ -11,7 +11,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: openssl-devel
|
||||
-BuildRequires: libattr-devel
|
||||
BuildRequires: keyutils-libs-devel
|
||||
|
||||
%description
|
||||
diff --git a/src/evmctl.c b/src/evmctl.c
|
||||
index 2ffee78..3fbcd33 100644
|
||||
--- a/src/evmctl.c
|
||||
+++ b/src/evmctl.c
|
||||
@@ -49,7 +49,7 @@
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
#include <dirent.h>
|
||||
-#include <attr/xattr.h>
|
||||
+#include <sys/xattr.h>
|
||||
#include <linux/xattr.h>
|
||||
#include <getopt.h>
|
||||
#include <keyutils.h>
|
||||
Loading…
Reference in new issue