Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
0ba1008684
@ -10,18 +10,20 @@
|
||||
, qtsvg
|
||||
, qtxmlpatterns
|
||||
, qttools
|
||||
, lib, stdenv
|
||||
, lib
|
||||
, stdenv
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
mkDerivationWith stdenv.mkDerivation rec {
|
||||
pname = "qcad";
|
||||
version = "3.26.0.1";
|
||||
version = "3.26.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qcad";
|
||||
repo = "qcad";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-V+QlwM8BWmcarwZtqJfc+MYHOZgIH1W5R8m2EHhNJls=";
|
||||
sha256 = "sha256-OWAc7g8DiJR3z6dUF5D0Yo3wnRKd1Xe7D1eq15NRW5c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -36,7 +38,7 @@ mkDerivationWith stdenv.mkDerivation rec {
|
||||
src/3rdparty/qt-labs-qtscriptgenerator-5.14.0/qt-labs-qtscriptgenerator-5.14.0.pro \
|
||||
src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version}/qt-labs-qtscriptgenerator-${qtbase.version}.pro
|
||||
fi
|
||||
'';
|
||||
'';
|
||||
|
||||
qmakeFlags = [
|
||||
"MUPARSER_DIR=${muparser}"
|
||||
@ -65,15 +67,27 @@ mkDerivationWith stdenv.mkDerivation rec {
|
||||
cp -r scripts $out/lib
|
||||
cp -r plugins $out/lib/plugins
|
||||
cp -r patterns $out/lib/patterns
|
||||
cp -r fonts $out/lib/fonts
|
||||
cp -r libraries $out/lib/libraries
|
||||
cp -r linetypes $out/lib/linetypes
|
||||
cp -r ts $out/lib/ts
|
||||
|
||||
# workaround to fix the library browser:
|
||||
rm -r $out/lib/plugins/sqldrivers
|
||||
ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/sqldrivers
|
||||
|
||||
rm -r $out/lib/plugins/printsupport
|
||||
ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/printsupport
|
||||
|
||||
rm -r $out/lib/plugins/imageformats
|
||||
ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/imageformats
|
||||
|
||||
install -Dm644 scripts/qcad_icon.svg $out/share/icons/hicolor/scalable/apps/qcad.svg
|
||||
|
||||
installManPage qcad.1
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
@ -89,6 +103,7 @@ mkDerivationWith stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
qmake
|
||||
qttools
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -265,10 +265,10 @@ in {
|
||||
};
|
||||
|
||||
ruby_3_0 = generic {
|
||||
version = rubyVersion "3" "0" "0" "";
|
||||
version = rubyVersion "3" "0" "1" "";
|
||||
sha256 = {
|
||||
src = "0a4fmxafxvkg1m738g2lmkhipwnmd96kzqy1m9kvk3n1l50x2gm1";
|
||||
git = "0fvnxv97m94nridlc5nvvrlg53pr5g042dkfc5ysd327s7xj4cjp";
|
||||
src = "09vpnxxcxc46qv40xbxr9xkdpbgb0imdy25l2vpsxxlr47djb61n";
|
||||
git = "0vricyhnnczcbsgvz65pdhi9yx1i34zarbjlc5y5mcmj01y9r7ar";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
"${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch"
|
||||
"${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch"
|
||||
];
|
||||
"3.0.0" = ops useRailsExpress [
|
||||
"3.0.1" = ops useRailsExpress [
|
||||
"${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch"
|
||||
"${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch"
|
||||
];
|
||||
|
||||
@ -17,40 +17,57 @@
|
||||
let
|
||||
# Release notes and download URLs are here:
|
||||
# https://registrationcenter.intel.com/en/products/
|
||||
version = "${year}.${spot}.${rel}";
|
||||
version = "${mklVersion}.${rel}";
|
||||
|
||||
# Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details:
|
||||
# https://github.com/matthewbauer/undmg/issues/4
|
||||
year = if stdenvNoCC.isDarwin then "2019" else "2020";
|
||||
spot = if stdenvNoCC.isDarwin then "3" else "4";
|
||||
rel = if stdenvNoCC.isDarwin then "199" else "304";
|
||||
mklVersion = if stdenvNoCC.isDarwin then "2019.3" else "2021.1.1";
|
||||
rel = if stdenvNoCC.isDarwin then "199" else "52";
|
||||
|
||||
# Replace `openmpSpot` by `spot` after 2020.
|
||||
openmpSpot = if stdenvNoCC.isDarwin then spot else "3";
|
||||
# Intel openmp uses its own versioning.
|
||||
openmpVersion = if stdenvNoCC.isDarwin then "19.0.3" else "19.1.3";
|
||||
openmpRel = "189";
|
||||
|
||||
rpm-ver = "${year}.${spot}-${rel}-${year}.${spot}-${rel}";
|
||||
|
||||
# Intel openmp uses its own versioning, but shares the spot release patch.
|
||||
openmp = if stdenvNoCC.isDarwin then "19.0" else "19.1";
|
||||
openmp-ver = "${openmp}.${openmpSpot}-${rel}-${openmp}.${openmpSpot}-${rel}";
|
||||
# Thread Building Blocks release.
|
||||
tbbRel = "119";
|
||||
|
||||
shlibExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary;
|
||||
|
||||
in stdenvNoCC.mkDerivation {
|
||||
oneapi-mkl = fetchurl {
|
||||
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm";
|
||||
hash = "sha256-G2Y7iX3UN2YUJhxcMM2KmhONf0ls9owpGlOo8hHOfqA=";
|
||||
};
|
||||
|
||||
oneapi-mkl-common = fetchurl {
|
||||
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-${mklVersion}-${mklVersion}-${rel}.noarch.rpm";
|
||||
hash = "sha256-HrMt2OcPIRxM8EL8SPjYTyuHJnC7RhPFUrvLhRH+7vc=";
|
||||
};
|
||||
|
||||
oneapi-mkl-common-devel = fetchurl {
|
||||
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-devel-${mklVersion}-${mklVersion}-${rel}.noarch.rpm";
|
||||
hash = "sha256-XDE2WFJzEcpujFmO2AvqQdipZMvKB6/G+ksBe2sE438=";
|
||||
};
|
||||
|
||||
oneapi-mkl-devel = fetchurl {
|
||||
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-devel-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm";
|
||||
hash = "sha256-GhUJZ0Vr/ZXp10maie29/5ryU7zzX3F++wRCuuFcE0s=";
|
||||
};
|
||||
|
||||
oneapi-openmp = fetchurl {
|
||||
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-openmp-${mklVersion}-${mklVersion}-${openmpRel}.x86_64.rpm";
|
||||
hash = "sha256-yP2c4aQAFNRffjLoIZgWXLcNXbiez8smsgu2wXitefU=";
|
||||
};
|
||||
|
||||
oneapi-tbb = fetchurl {
|
||||
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-tbb-${mklVersion}-${mklVersion}-${tbbRel}.x86_64.rpm";
|
||||
hash = "sha256-K1BvhGoGVU2Zwy5vg2ZvJWBrSdh5uQwo0znt5039X0A=";
|
||||
};
|
||||
|
||||
in stdenvNoCC.mkDerivation ({
|
||||
pname = "mkl";
|
||||
inherit version;
|
||||
|
||||
src = if stdenvNoCC.isDarwin
|
||||
then
|
||||
(fetchurl {
|
||||
url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15235/m_mkl_${version}.dmg";
|
||||
sha256 = "14b3ciz7995sqcd6jz7hc8g2x4zwvqxmgxgni46vrlb7n523l62f";
|
||||
})
|
||||
else
|
||||
(fetchurl {
|
||||
url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16917/l_mkl_${version}.tgz";
|
||||
hash = "sha256-IxTUZTaXTb0I8qTk+emhVdx+eeJ5jHTn3fqtAKWRfqU=";
|
||||
});
|
||||
dontUnpack = stdenvNoCC.isLinux;
|
||||
|
||||
nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin
|
||||
then
|
||||
@ -63,30 +80,15 @@ in stdenvNoCC.mkDerivation {
|
||||
tar xzvf $f
|
||||
done
|
||||
'' else ''
|
||||
# Common stuff
|
||||
rpmextract rpm/intel-mkl-core-${rpm-ver}.x86_64.rpm
|
||||
rpmextract rpm/intel-mkl-common-c-${rpm-ver}.noarch.rpm
|
||||
rpmextract rpm/intel-mkl-common-f-${rpm-ver}.noarch.rpm
|
||||
rpmextract ${oneapi-mkl}
|
||||
rpmextract ${oneapi-mkl-common}
|
||||
rpmextract ${oneapi-mkl-common-devel}
|
||||
rpmextract ${oneapi-mkl-devel}
|
||||
rpmextract ${oneapi-openmp}
|
||||
rpmextract ${oneapi-tbb}
|
||||
'';
|
||||
|
||||
# Dynamic libraries
|
||||
rpmextract rpm/intel-mkl-cluster-rt-${rpm-ver}.x86_64.rpm
|
||||
rpmextract rpm/intel-mkl-core-rt-${rpm-ver}.x86_64.rpm
|
||||
rpmextract rpm/intel-mkl-gnu-f-rt-${rpm-ver}.x86_64.rpm
|
||||
rpmextract rpm/intel-mkl-gnu-rt-${rpm-ver}.x86_64.rpm
|
||||
|
||||
# Intel OpenMP runtime
|
||||
rpmextract rpm/intel-openmp-${openmp-ver}.x86_64.rpm
|
||||
'' + (if enableStatic then ''
|
||||
# Static libraries
|
||||
rpmextract rpm/intel-mkl-cluster-${rpm-ver}.x86_64.rpm
|
||||
rpmextract rpm/intel-mkl-gnu-${rpm-ver}.x86_64.rpm
|
||||
rpmextract rpm/intel-mkl-gnu-f-${rpm-ver}.x86_64.rpm
|
||||
'' else ''
|
||||
# Take care of installing dynamic-only PkgConfig files during the installPhase
|
||||
''
|
||||
);
|
||||
|
||||
installPhase = ''
|
||||
installPhase = if stdenvNoCC.isDarwin then ''
|
||||
for f in $(find . -name 'mkl*.pc') ; do
|
||||
bn=$(basename $f)
|
||||
substituteInPlace $f \
|
||||
@ -95,42 +97,54 @@ in stdenvNoCC.mkDerivation {
|
||||
--replace "lib/intel64_lin" "lib" \
|
||||
--replace "lib/intel64" "lib"
|
||||
done
|
||||
|
||||
for f in $(find opt/intel -name 'mkl*iomp.pc') ; do
|
||||
substituteInPlace $f \
|
||||
--replace "../compiler/lib" "lib"
|
||||
done
|
||||
'' +
|
||||
(if stdenvNoCC.isDarwin then ''
|
||||
mkdir -p $out/lib
|
||||
|
||||
cp -r compilers_and_libraries_${version}/mac/mkl/include $out/
|
||||
mkdir -p $out/lib
|
||||
|
||||
cp -r compilers_and_libraries_${version}/licensing/mkl/en/license.txt $out/lib/
|
||||
cp -r compilers_and_libraries_${version}/mac/compiler/lib/* $out/lib/
|
||||
cp -r compilers_and_libraries_${version}/mac/mkl/lib/* $out/lib/
|
||||
cp -r compilers_and_libraries_${version}/mac/tbb/lib/* $out/lib/
|
||||
cp -r compilers_and_libraries_${version}/mac/mkl/include $out/
|
||||
|
||||
mkdir -p $out/lib/pkgconfig
|
||||
cp -r compilers_and_libraries_${version}/mac/mkl/bin/pkgconfig/* $out/lib/pkgconfig
|
||||
cp -r compilers_and_libraries_${version}/licensing/mkl/en/license.txt $out/lib/
|
||||
cp -r compilers_and_libraries_${version}/mac/compiler/lib/* $out/lib/
|
||||
cp -r compilers_and_libraries_${version}/mac/mkl/lib/* $out/lib/
|
||||
cp -r compilers_and_libraries_${version}/mac/tbb/lib/* $out/lib/
|
||||
|
||||
mkdir -p $out/lib/pkgconfig
|
||||
cp -r compilers_and_libraries_${version}/mac/mkl/bin/pkgconfig/* $out/lib/pkgconfig
|
||||
'' else ''
|
||||
mkdir -p $out/lib
|
||||
cp license.txt $out/lib/
|
||||
for f in $(find . -name 'mkl*.pc') ; do
|
||||
bn=$(basename $f)
|
||||
substituteInPlace $f \
|
||||
--replace $\{MKLROOT} "$out" \
|
||||
--replace "lib/intel64" "lib"
|
||||
|
||||
cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/include $out/
|
||||
sed -r -i "s|^prefix=.*|prefix=$out|g" $f
|
||||
done
|
||||
|
||||
mkdir -p $out/lib/pkgconfig
|
||||
'') +
|
||||
for f in $(find opt/intel -name 'mkl*iomp.pc') ; do
|
||||
substituteInPlace $f --replace "../compiler/lib" "lib"
|
||||
done
|
||||
|
||||
# License
|
||||
install -Dm0655 -t $out/share/doc/mkl opt/intel/oneapi/mkl/2021.1.1/licensing/en/license.txt
|
||||
|
||||
# Dynamic libraries
|
||||
install -Dm0755 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so*
|
||||
install -Dm0755 -t $out/lib opt/intel/oneapi/compiler/2021.1.1/linux/compiler/lib/intel64_lin/*.so*
|
||||
install -Dm0755 -t $out/lib opt/intel/oneapi/tbb/2021.1.1/lib/intel64/gcc4.8/*.so*
|
||||
|
||||
# Headers
|
||||
cp -r opt/intel/oneapi/mkl/${mklVersion}/include $out/
|
||||
'' +
|
||||
(if enableStatic then ''
|
||||
cp -r opt/intel/compilers_and_libraries_${version}/linux/compiler/lib/intel64_lin/* $out/lib/
|
||||
cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/* $out/lib/
|
||||
cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/bin/pkgconfig/* $out/lib/pkgconfig
|
||||
install -Dm0644 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.a
|
||||
install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/2021.1.1/tools/pkgconfig/*.pc
|
||||
'' else ''
|
||||
cp -r opt/intel/compilers_and_libraries_${version}/linux/compiler/lib/intel64_lin/*.so* $out/lib/
|
||||
cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/*.so* $out/lib/
|
||||
cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/bin/pkgconfig/*dynamic*.pc $out/lib/pkgconfig
|
||||
cp opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so* $out/lib
|
||||
install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/2021.1.1/tools/pkgconfig/*dynamic*.pc
|
||||
'') + ''
|
||||
|
||||
# Setup symlinks for blas / lapack
|
||||
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}
|
||||
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}
|
||||
@ -159,13 +173,18 @@ in stdenvNoCC.mkDerivation {
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
|
||||
passthru.tests.pkg-config = callPackage ./test { };
|
||||
passthru.tests = {
|
||||
pkg-config-dynamic-iomp = callPackage ./test { enableStatic = false; execution = "iomp"; };
|
||||
pkg-config-static-iomp = callPackage ./test { enableStatic = true; execution = "iomp"; };
|
||||
pkg-config-dynamic-seq = callPackage ./test { enableStatic = false; execution = "seq"; };
|
||||
pkg-config-static-seq = callPackage ./test { enableStatic = true; execution = "seq"; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Intel Math Kernel Library";
|
||||
description = "Intel OneAPI Math Kernel Library";
|
||||
longDescription = ''
|
||||
Intel Math Kernel Library (Intel MKL) optimizes code with minimal effort
|
||||
for future generations of Intel processors. It is compatible with your
|
||||
Intel OneAPI Math Kernel Library (Intel oneMKL) optimizes code with minimal
|
||||
effort for future generations of Intel processors. It is compatible with your
|
||||
choice of compilers, languages, operating systems, and linking and
|
||||
threading models.
|
||||
'';
|
||||
@ -174,4 +193,9 @@ in stdenvNoCC.mkDerivation {
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
maintainers = with maintainers; [ bhipple ];
|
||||
};
|
||||
}
|
||||
} // lib.optionalAttrs stdenvNoCC.isDarwin {
|
||||
src = fetchurl {
|
||||
url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15235/m_mkl_${version}.dmg";
|
||||
sha256 = "14b3ciz7995sqcd6jz7hc8g2x4zwvqxmgxgni46vrlb7n523l62f";
|
||||
};
|
||||
})
|
||||
|
||||
@ -1,6 +1,14 @@
|
||||
{ stdenv, pkg-config, mkl }:
|
||||
{ stdenv
|
||||
, pkg-config
|
||||
, mkl
|
||||
|
||||
stdenv.mkDerivation {
|
||||
, enableStatic ? false
|
||||
, execution ? "seq"
|
||||
}:
|
||||
|
||||
let
|
||||
linkType = if enableStatic then "static" else "dynamic";
|
||||
in stdenv.mkDerivation {
|
||||
pname = "mkl-test";
|
||||
version = mkl.version;
|
||||
|
||||
@ -8,19 +16,19 @@ stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ mkl ];
|
||||
buildInputs = [ (mkl.override { inherit enableStatic; }) ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
buildPhase = ''
|
||||
# Check regular Nix build.
|
||||
gcc $(pkg-config --cflags --libs mkl-dynamic-ilp64-seq) test.c -o test
|
||||
gcc test.c -o test $(pkg-config --cflags --libs mkl-${linkType}-ilp64-${execution})
|
||||
|
||||
# Clear flags to ensure that we are purely relying on options
|
||||
# provided by pkg-config.
|
||||
NIX_CFLAGS_COMPILE="" \
|
||||
NIX_LDFLAGS="" \
|
||||
gcc $(pkg-config --cflags --libs mkl-dynamic-ilp64-seq) test.c -o test
|
||||
gcc test.c -o test $(pkg-config --cflags --libs mkl-${linkType}-ilp64-${execution})
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
{ stdenv, lib, fetchurl, nasm }:
|
||||
{ stdenv, lib, fetchurl, nasm
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "x264";
|
||||
@ -28,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
export AS=$CC
|
||||
'';
|
||||
|
||||
configureFlags = [ "--enable-shared" ]
|
||||
configureFlags = lib.optional enableShared [ "--enable-shared" ]
|
||||
++ lib.optional (!stdenv.isi686) "--enable-pic"
|
||||
++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}";
|
||||
|
||||
|
||||
23
pkgs/development/python-modules/localimport/default.nix
Normal file
23
pkgs/development/python-modules/localimport/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "localimport";
|
||||
version = "1.7.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-p7ACOzJRwH9hICMcxtVt/r+twEoFsDxPKGuarFnFIbo=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "localimport" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/NiklasRosenstein/py-localimport";
|
||||
description = "Isolated import of Python modules";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
};
|
||||
}
|
||||
47
pkgs/development/python-modules/nodepy-runtime/default.nix
Normal file
47
pkgs/development/python-modules/nodepy-runtime/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, localimport
|
||||
, pathlib2
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nodepy-runtime";
|
||||
version = "2.1.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-6tSsD76EpCZxkdulv1BcUZtIXGWLG6PuII25J8STygE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
localimport
|
||||
pathlib2
|
||||
six
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"nodepy"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/nodepy/nodepy";
|
||||
description = "Runtime for Python inspired by Node.JS";
|
||||
longDescription = ''
|
||||
Node.py is a Python runtime and package manager compatible with CPython
|
||||
2.7 and 3.3 – 3.6. It provides a separate import mechanism for modules
|
||||
inspired by Node.js, bringing dependency management and ease of deployment
|
||||
for Python applications up to par with other languages without virtual
|
||||
environments.
|
||||
|
||||
Node.py comes with a built-in package manager that builds on Pip for
|
||||
standard Python dependencies but also adds the capability to install
|
||||
packages that are specifically developed for Node.py. To install the
|
||||
dependencies of the package manager you must specify the [pm] install
|
||||
extra.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
};
|
||||
}
|
||||
@ -1,25 +1,53 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
|
||||
, importlib-resources, pytest, xvfb_run }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, importlib-resources
|
||||
, pyqtwebengine
|
||||
, pytest
|
||||
, pythonOlder
|
||||
, qt5
|
||||
, xvfb_run
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywebview";
|
||||
version = "3.3.1";
|
||||
version = "3.4";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "r0x0r";
|
||||
repo = "pywebview";
|
||||
rev = version;
|
||||
sha256 = "015z7n0hdgkzn0p7aw1xsv6lwc260p8q67jx0zyd1zghnwyj8k79";
|
||||
sha256 = "sha256-3JHwtw8oReolEl4k8cdt7GCVGNkfWWJN6EnZYHxzDO8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ importlib-resources ];
|
||||
nativeBuildInputs = [
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
checkInputs = [ pytest xvfb_run ];
|
||||
propagatedBuildInputs = [
|
||||
pyqtwebengine
|
||||
] ++ lib.optionals (pythonOlder "3.7") [ importlib-resources ];
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
xvfb_run
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
# Cannot create directory /homeless-shelter/.... Error: FILE_ERROR_ACCESS_DENIED
|
||||
export HOME=$TMPDIR
|
||||
# QStandardPaths: XDG_RUNTIME_DIR not set
|
||||
export XDG_RUNTIME_DIR=$HOME/xdg-runtime-dir
|
||||
|
||||
pushd tests
|
||||
substituteInPlace run.sh \
|
||||
--replace "PYTHONPATH=.." "PYTHONPATH=$PYTHONPATH" \
|
||||
--replace "pywebviewtest test_js_api.py::test_concurrent ''${PYTEST_OPTIONS}" "# skip flaky test_js_api.py::test_concurrent"
|
||||
|
||||
patchShebangs run.sh
|
||||
wrapQtApp run.sh
|
||||
|
||||
xvfb-run -s '-screen 0 800x600x24' ./run.sh
|
||||
popd
|
||||
'';
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
tree }:
|
||||
|
||||
let
|
||||
version = "3.14.2";
|
||||
version = "3.14.4";
|
||||
|
||||
# Dependencies should match the ones in:
|
||||
# https://github.com/erlang/rebar3/blob/${version}/rebar.lock
|
||||
@ -12,27 +12,27 @@ let
|
||||
bbmustache = fetchHex {
|
||||
pkg = "bbmustache";
|
||||
version = "1.10.0";
|
||||
sha256 = "43effa3fd4bb9523157af5a9e2276c493495b8459fc8737144aa186cb13ce2ee";
|
||||
sha256 = "1vp27jqnq65a8iqp7j4z8nw9ad29dhky5agmg8aj75dvshzzmvs3";
|
||||
};
|
||||
certifi = fetchHex {
|
||||
pkg = "certifi";
|
||||
version = "2.5.2";
|
||||
sha256 = "3b3b5f36493004ac3455966991eaf6e768ce9884693d9968055aeeeb1e575040";
|
||||
version = "2.5.3";
|
||||
sha256 = "040w1scglvqhcvc1ifdnlcyrbwr0smi00w4xi8h03c99775nllgd";
|
||||
};
|
||||
cf = fetchHex {
|
||||
pkg = "cf";
|
||||
version = "0.3.1";
|
||||
sha256 = "315e8d447d3a4b02bcdbfa397ad03bbb988a6e0aa6f44d3add0f4e3c3bf97672";
|
||||
sha256 = "0wknz4xkqkhgvlx4vx5619p8m65v7g87lfgsvfy04jrsgm28spii";
|
||||
};
|
||||
cth_readable = fetchHex {
|
||||
pkg = "cth_readable";
|
||||
version = "1.4.9";
|
||||
sha256 = "b4c6ababdb046c5f2fbb3c22f030b4c5a679083956dcdd29c1df0cb30b18da24";
|
||||
version = "1.5.0";
|
||||
sha256 = "0z58b6frqdnhyzrmbdf6x78l3izbbh5z5i3am8hqc253r7xwv0dx";
|
||||
};
|
||||
erlware_commons = fetchHex {
|
||||
pkg = "erlware_commons";
|
||||
version = "1.3.1";
|
||||
sha256 = "7aada93f368d0a0430122e39931b7fb4ac9e94dbf043cdc980ad4330fd9cd166";
|
||||
version = "1.4.0";
|
||||
sha256 = "1rp2vkgzqm6sax7fc13rh9x6qzxsgg718dnv7l0kmarvyifcyphq";
|
||||
};
|
||||
eunit_formatters = fetchHex {
|
||||
pkg = "eunit_formatters";
|
||||
@ -46,29 +46,26 @@ let
|
||||
};
|
||||
parse_trans = fetchHex {
|
||||
pkg = "parse_trans";
|
||||
version = "3.3.0";
|
||||
sha256 = "17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960";
|
||||
version = "3.3.1";
|
||||
sha256 = "12w8ai6b5s6b4hnvkav7hwxd846zdd74r32f84nkcmjzi1vrbk87";
|
||||
};
|
||||
|
||||
providers = fetchHex {
|
||||
pkg = "providers";
|
||||
version = "1.8.1";
|
||||
sha256 = "e45745ade9c476a9a469ea0840e418ab19360dc44f01a233304e118a44486ba0";
|
||||
sha256 = "183b9128l4af60rs40agqh6kc6db33j4027ad6jajxn4x6nlamz4";
|
||||
};
|
||||
|
||||
relx = fetchHex {
|
||||
pkg = "relx";
|
||||
version = "4.1.0";
|
||||
sha256 = "b94a3f96697a479ee5217a853345e0f4977bdf40d3c040af0d3d80fadad82af4";
|
||||
version = "4.3.0";
|
||||
sha256 = "0h044arh41sr92r1nlg176shavlv7pvw17alwklhszgwlr4hk3kk";
|
||||
};
|
||||
|
||||
ssl_verify_fun = fetchHex {
|
||||
pkg = "ssl_verify_fun";
|
||||
version = "1.1.6";
|
||||
sha256 = "bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680";
|
||||
};
|
||||
|
||||
hex_core = fetchHex {
|
||||
pkg = "hex_core";
|
||||
version = "0.7.1";
|
||||
sha256 = "05c60411511b6dc79affcd99a93e67d71e1b9d6abcb28ba75cd4ebc8585b8d02";
|
||||
sha256 = "1026l1z1jh25z8bfrhaw0ryk5gprhrpnirq877zqhg253x3x5c5x";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
@ -81,7 +78,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "erlang";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "02gz6xs8j5rm14r6dndcpdm8q3rl4mcj363gnnx4y5xvvfnv9bfa";
|
||||
sha256 = "09bnqwli93sq1pcz4h88ks7qg7k8yrjy9fd46yyp8xdl7i4irwy2";
|
||||
};
|
||||
|
||||
bootstrapper = ./rebar3-nix-bootstrap;
|
||||
@ -104,8 +101,6 @@ stdenv.mkDerivation rec {
|
||||
cp --no-preserve=mode -R ${relx} _checkouts/relx
|
||||
cp --no-preserve=mode -R ${ssl_verify_fun} _checkouts/ssl_verify_fun
|
||||
|
||||
cp --no-preserve=mode -R ${hex_core} _checkouts/hex_core
|
||||
|
||||
# Bootstrap script expects the dependencies in _build/default/lib
|
||||
# TODO: Make it accept checkouts?
|
||||
for i in _checkouts/* ; do
|
||||
|
||||
29
pkgs/games/antsimulator/default.nix
Normal file
29
pkgs/games/antsimulator/default.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, sfml }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "antsimulator";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johnBuffer";
|
||||
repo = "AntSimulator";
|
||||
rev = "v${version}";
|
||||
sha256 = "0wz80971rf86kb7mcnxwrq75vriwhmyir5s5n3wzml12rzfnj5f1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ sfml ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
install -Dm755 ./AntSimulator $out/bin/antsimulator
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/johnBuffer/AntSimulator";
|
||||
description = "Simple Ants simulator";
|
||||
license = licenses.free;
|
||||
maintainers = with maintainers; [ ivar ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -14,8 +14,6 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-TelZDuCah8KC1Vhzf/tbYXXMv9JtWArdEN9E0PBH9sI=";
|
||||
};
|
||||
|
||||
patches = lib.optional isStatic ./no-shared-lib.patch;
|
||||
|
||||
outputs = [ "out" "dev" "lib" "man" "doc" ]
|
||||
++ lib.optional usePam "pam";
|
||||
|
||||
@ -31,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
"PAM_CAP=${if usePam then "yes" else "no"}"
|
||||
"BUILD_CC=$(CC_FOR_BUILD)"
|
||||
"CC:=$(CC)"
|
||||
];
|
||||
] ++ lib.optional isStatic "SHARED=no";
|
||||
|
||||
prePatch = ''
|
||||
# use full path to bash
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
diff --git a/libcap/Makefile b/libcap/Makefile
|
||||
index de6a28d..7e4d8ac 100644
|
||||
--- a/libcap/Makefile
|
||||
+++ b/libcap/Makefile
|
||||
@@ -22,7 +22,7 @@ MAJLIBNAME=$(LIBNAME).$(VERSION)
|
||||
MINLIBNAME=$(MAJLIBNAME).$(MINOR)
|
||||
GPERF_OUTPUT = _caps_output.gperf
|
||||
|
||||
-all: $(MINLIBNAME) $(STACAPLIBNAME) pcs $(STAPSXLIBNAME)
|
||||
+all: $(STACAPLIBNAME) pcs $(STAPSXLIBNAME)
|
||||
|
||||
pcs: libcap.pc libpsx.pc
|
||||
|
||||
@@ -93,7 +93,7 @@ cap_test: cap_test.c libcap.h
|
||||
test: cap_test
|
||||
./cap_test
|
||||
|
||||
-install: install-static install-shared
|
||||
+install: install-static
|
||||
|
||||
install-static: install-static-cap install-static-psx
|
||||
|
||||
@ -154,6 +154,8 @@ in
|
||||
|
||||
ankisyncd = callPackage ../servers/ankisyncd { };
|
||||
|
||||
antsimulator = callPackage ../games/antsimulator { };
|
||||
|
||||
fiche = callPackage ../servers/fiche { };
|
||||
|
||||
fishnet = callPackage ../servers/fishnet { };
|
||||
@ -2804,6 +2806,8 @@ in
|
||||
|
||||
nix-template = callPackage ../tools/package-management/nix-template { };
|
||||
|
||||
nodepy-runtime = with python3.pkgs; toPythonApplication nodepy-runtime;
|
||||
|
||||
nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools;
|
||||
|
||||
noteshrink = callPackage ../tools/misc/noteshrink { };
|
||||
|
||||
@ -4012,6 +4012,8 @@ in {
|
||||
|
||||
lmtpd = callPackage ../development/python-modules/lmtpd { };
|
||||
|
||||
localimport = callPackage ../development/python-modules/localimport { };
|
||||
|
||||
localzone = callPackage ../development/python-modules/localzone { };
|
||||
|
||||
locket = callPackage ../development/python-modules/locket { };
|
||||
@ -4647,6 +4649,8 @@ in {
|
||||
|
||||
nodeenv = callPackage ../development/python-modules/nodeenv { };
|
||||
|
||||
nodepy-runtime = callPackage ../development/python-modules/nodepy-runtime { };
|
||||
|
||||
node-semver = callPackage ../development/python-modules/node-semver { };
|
||||
|
||||
noise = callPackage ../development/python-modules/noise { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user