|
@@ -1,23 +1,24 @@
|
|
|
-{ lib
|
|
|
|
|
-, stdenv
|
|
|
|
|
-, fetchFromGitHub
|
|
|
|
|
-, python3
|
|
|
|
|
-, fetchYarnDeps
|
|
|
|
|
-, yarn
|
|
|
|
|
-, nodejs
|
|
|
|
|
-, node-pre-gyp
|
|
|
|
|
-, node-gyp
|
|
|
|
|
-, prefetch-yarn-deps
|
|
|
|
|
-, fixup-yarn-lock
|
|
|
|
|
-, makeWrapper
|
|
|
|
|
-, gitUpdater
|
|
|
|
|
-, pkg-config
|
|
|
|
|
-, sqlite
|
|
|
|
|
-, apple-sdk
|
|
|
|
|
-, cctools
|
|
|
|
|
-, cacert
|
|
|
|
|
-, fetchPypi
|
|
|
|
|
-, python3Packages
|
|
|
|
|
|
|
+{
|
|
|
|
|
+ lib,
|
|
|
|
|
+ stdenv,
|
|
|
|
|
+ fetchFromGitHub,
|
|
|
|
|
+ python3,
|
|
|
|
|
+ fetchYarnDeps,
|
|
|
|
|
+ yarn,
|
|
|
|
|
+ nodejs,
|
|
|
|
|
+ node-pre-gyp,
|
|
|
|
|
+ node-gyp,
|
|
|
|
|
+ prefetch-yarn-deps,
|
|
|
|
|
+ fixup-yarn-lock,
|
|
|
|
|
+ makeWrapper,
|
|
|
|
|
+ gitUpdater,
|
|
|
|
|
+ pkg-config,
|
|
|
|
|
+ sqlite,
|
|
|
|
|
+ apple-sdk,
|
|
|
|
|
+ cctools,
|
|
|
|
|
+ cacert,
|
|
|
|
|
+ fetchPypi,
|
|
|
|
|
+ python3Packages,
|
|
|
}:
|
|
}:
|
|
|
|
|
|
|
|
let
|
|
let
|
|
@@ -59,18 +60,20 @@ stdenv.mkDerivation rec {
|
|
|
hash = "sha256-7zyuBxheftgCXGjjJ+rdwSslIro9IEd/uvmo4xp6I+Q=";
|
|
hash = "sha256-7zyuBxheftgCXGjjJ+rdwSslIro9IEd/uvmo4xp6I+Q=";
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- gristPython = python3.withPackages (pkgs: with pkgs; [
|
|
|
|
|
- friendly-traceback
|
|
|
|
|
- openpyxl
|
|
|
|
|
- astroid
|
|
|
|
|
- roman
|
|
|
|
|
- chardet
|
|
|
|
|
- iso8601
|
|
|
|
|
- phonenumberslite
|
|
|
|
|
- python-dateutil
|
|
|
|
|
- sortedcontainers
|
|
|
|
|
- unittest-xml-reporting
|
|
|
|
|
- ]);
|
|
|
|
|
|
|
+ gristPython = python3.withPackages (
|
|
|
|
|
+ pkgs: with pkgs; [
|
|
|
|
|
+ friendly-traceback
|
|
|
|
|
+ openpyxl
|
|
|
|
|
+ astroid
|
|
|
|
|
+ roman
|
|
|
|
|
+ chardet
|
|
|
|
|
+ iso8601
|
|
|
|
|
+ phonenumberslite
|
|
|
|
|
+ python-dateutil
|
|
|
|
|
+ sortedcontainers
|
|
|
|
|
+ unittest-xml-reporting
|
|
|
|
|
+ ]
|
|
|
|
|
+ );
|
|
|
|
|
|
|
|
nativeBuildInputs = [
|
|
nativeBuildInputs = [
|
|
|
yarn
|
|
yarn
|
|
@@ -82,13 +85,15 @@ stdenv.mkDerivation rec {
|
|
|
makeWrapper
|
|
makeWrapper
|
|
|
pkg-config
|
|
pkg-config
|
|
|
python3
|
|
python3
|
|
|
- ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
|
|
|
|
|
|
+ ]
|
|
|
|
|
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
|
|
cctools
|
|
cctools
|
|
|
];
|
|
];
|
|
|
|
|
|
|
|
buildInputs = [
|
|
buildInputs = [
|
|
|
sqlite
|
|
sqlite
|
|
|
- ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
|
|
|
|
|
|
+ ]
|
|
|
|
|
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
|
|
apple-sdk
|
|
apple-sdk
|
|
|
];
|
|
];
|
|
|
|
|
|
|
@@ -158,13 +163,13 @@ stdenv.mkDerivation rec {
|
|
|
rm -f $out/libexec/static/mocha.js
|
|
rm -f $out/libexec/static/mocha.js
|
|
|
rm -f $out/libexec/static/sinon.js
|
|
rm -f $out/libexec/static/sinon.js
|
|
|
rm -f $out/libexec/static/mocha.css
|
|
rm -f $out/libexec/static/mocha.css
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
# Fix or remove broken symlinks
|
|
# Fix or remove broken symlinks
|
|
|
find $out/libexec/bower_components -type l ! -exec test -e {} \; -delete
|
|
find $out/libexec/bower_components -type l ! -exec test -e {} \; -delete
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
# Remove problematic .bin directories
|
|
# Remove problematic .bin directories
|
|
|
find $out/libexec/node_modules -name '.bin' -type d -print0 | xargs -0 rm -rf 2>/dev/null || true
|
|
find $out/libexec/node_modules -name '.bin' -type d -print0 | xargs -0 rm -rf 2>/dev/null || true
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
# Fix ELF binaries in Python virtual environment using autoPatchelf
|
|
# Fix ELF binaries in Python virtual environment using autoPatchelf
|
|
|
if [ -d "$out/libexec/sandbox_venv3" ]; then
|
|
if [ -d "$out/libexec/sandbox_venv3" ]; then
|
|
|
find "$out/libexec/sandbox_venv3" -type f -executable \
|
|
find "$out/libexec/sandbox_venv3" -type f -executable \
|