mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-16 17:41:33 +03:00
Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
commit
e93e71ce44
@ -12995,6 +12995,12 @@
|
|||||||
githubId = 12877905;
|
githubId = 12877905;
|
||||||
name = "Roman Volosatovs";
|
name = "Roman Volosatovs";
|
||||||
};
|
};
|
||||||
|
rxiao = {
|
||||||
|
email = "ben.xiao@me.com";
|
||||||
|
github = "benxiao";
|
||||||
|
githubId = 10908495;
|
||||||
|
name = "Ran Xiao";
|
||||||
|
};
|
||||||
ryanartecona = {
|
ryanartecona = {
|
||||||
email = "ryanartecona@gmail.com";
|
email = "ryanartecona@gmail.com";
|
||||||
github = "ryanartecona";
|
github = "ryanartecona";
|
||||||
|
@ -81,7 +81,7 @@ in {
|
|||||||
extraDisk = mkOption {
|
extraDisk = mkOption {
|
||||||
description = lib.mdDoc ''
|
description = lib.mdDoc ''
|
||||||
Optional extra disk/hdd configuration.
|
Optional extra disk/hdd configuration.
|
||||||
The disk will be an 'ext4' partition on a separate VMDK file.
|
The disk will be an 'ext4' partition on a separate file.
|
||||||
'';
|
'';
|
||||||
default = null;
|
default = null;
|
||||||
example = {
|
example = {
|
||||||
@ -183,8 +183,8 @@ in {
|
|||||||
export HOME=$PWD
|
export HOME=$PWD
|
||||||
export PATH=${pkgs.virtualbox}/bin:$PATH
|
export PATH=${pkgs.virtualbox}/bin:$PATH
|
||||||
|
|
||||||
echo "creating VirtualBox pass-through disk wrapper (no copying involved)..."
|
echo "converting image to VirtualBox format..."
|
||||||
VBoxManage internalcommands createrawvmdk -filename disk.vmdk -rawdisk $diskImage
|
VBoxManage convertfromraw $diskImage disk.vdi
|
||||||
|
|
||||||
${optionalString (cfg.extraDisk != null) ''
|
${optionalString (cfg.extraDisk != null) ''
|
||||||
echo "creating extra disk: data-disk.raw"
|
echo "creating extra disk: data-disk.raw"
|
||||||
@ -196,8 +196,8 @@ in {
|
|||||||
mkpart primary ext4 1MiB -1
|
mkpart primary ext4 1MiB -1
|
||||||
eval $(partx $dataDiskImage -o START,SECTORS --nr 1 --pairs)
|
eval $(partx $dataDiskImage -o START,SECTORS --nr 1 --pairs)
|
||||||
mkfs.ext4 -F -L ${cfg.extraDisk.label} $dataDiskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K
|
mkfs.ext4 -F -L ${cfg.extraDisk.label} $dataDiskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K
|
||||||
echo "creating extra disk: data-disk.vmdk"
|
echo "creating extra disk: data-disk.vdi"
|
||||||
VBoxManage internalcommands createrawvmdk -filename data-disk.vmdk -rawdisk $dataDiskImage
|
VBoxManage convertfromraw $dataDiskImage data-disk.vdi
|
||||||
''}
|
''}
|
||||||
|
|
||||||
echo "creating VirtualBox VM..."
|
echo "creating VirtualBox VM..."
|
||||||
@ -209,10 +209,10 @@ in {
|
|||||||
${lib.cli.toGNUCommandLineShell { } cfg.params}
|
${lib.cli.toGNUCommandLineShell { } cfg.params}
|
||||||
VBoxManage storagectl "$vmName" ${lib.cli.toGNUCommandLineShell { } cfg.storageController}
|
VBoxManage storagectl "$vmName" ${lib.cli.toGNUCommandLineShell { } cfg.storageController}
|
||||||
VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 0 --device 0 --type hdd \
|
VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 0 --device 0 --type hdd \
|
||||||
--medium disk.vmdk
|
--medium disk.vdi
|
||||||
${optionalString (cfg.extraDisk != null) ''
|
${optionalString (cfg.extraDisk != null) ''
|
||||||
VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 1 --device 0 --type hdd \
|
VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 1 --device 0 --type hdd \
|
||||||
--medium data-disk.vmdk
|
--medium data-disk.vdi
|
||||||
''}
|
''}
|
||||||
|
|
||||||
echo "exporting VirtualBox VM..."
|
echo "exporting VirtualBox VM..."
|
||||||
|
@ -44,7 +44,7 @@ in stdenv.mkDerivation {
|
|||||||
buildInputs = [
|
buildInputs = [
|
||||||
gettext pcre2 libpcap lua5 libssh nghttp2 openssl libgcrypt
|
gettext pcre2 libpcap lua5 libssh nghttp2 openssl libgcrypt
|
||||||
libgpg-error gnutls geoip c-ares glib zlib
|
libgpg-error gnutls geoip c-ares glib zlib
|
||||||
] ++ lib.optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
|
] ++ lib.optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools qtwayland ])
|
||||||
++ lib.optionals stdenv.isLinux [ libcap libnl ]
|
++ lib.optionals stdenv.isLinux [ libcap libnl ]
|
||||||
++ lib.optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]
|
++ lib.optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]
|
||||||
++ lib.optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]);
|
++ lib.optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]);
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
, libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras
|
, libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras
|
||||||
, qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43
|
, qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43
|
||||||
, alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib
|
, alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib
|
||||||
|
, yasm, glslang
|
||||||
# If open-watcom-bin is not passed, VirtualBox will fall back to use
|
# If open-watcom-bin is not passed, VirtualBox will fall back to use
|
||||||
# the shipped alternative sources (assembly).
|
# the shipped alternative sources (assembly).
|
||||||
, open-watcom-bin
|
, open-watcom-bin
|
||||||
@ -23,19 +24,19 @@ let
|
|||||||
buildType = "release";
|
buildType = "release";
|
||||||
# Use maintainers/scripts/update.nix to update the version and all related hashes or
|
# Use maintainers/scripts/update.nix to update the version and all related hashes or
|
||||||
# change the hashes in extpack.nix and guest-additions/default.nix as well manually.
|
# change the hashes in extpack.nix and guest-additions/default.nix as well manually.
|
||||||
version = "6.1.40";
|
version = "7.0.6";
|
||||||
in stdenv.mkDerivation {
|
in stdenv.mkDerivation {
|
||||||
pname = "virtualbox";
|
pname = "virtualbox";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
|
url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
|
||||||
sha256 = "bc857555d3e836ad9350a8f7b03bb54d2fdc04dddb2043d09813f4634bca4814";
|
sha256 = "f146d9a86a35af0abb010e628636fd800cb476cc2ce82f95b0c0ca876e1756ff";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "modsrc" ];
|
outputs = [ "out" "modsrc" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config which docbook_xsl docbook_xml_dtd_43 ]
|
nativeBuildInputs = [ pkg-config which docbook_xsl docbook_xml_dtd_43 yasm glslang ]
|
||||||
++ optional (!headless) wrapQtAppsHook;
|
++ optional (!headless) wrapQtAppsHook;
|
||||||
|
|
||||||
# Wrap manually because we wrap just a small number of executables.
|
# Wrap manually because we wrap just a small number of executables.
|
||||||
@ -94,7 +95,7 @@ in stdenv.mkDerivation {
|
|||||||
qtPluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}:${qtwayland.bin}/${qtbase.qtPluginPrefix}";
|
qtPluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}:${qtwayland.bin}/${qtbase.qtPluginPrefix}";
|
||||||
})
|
})
|
||||||
++ [
|
++ [
|
||||||
./qtx11extras.patch
|
./qt-dependency-paths.patch
|
||||||
# https://github.com/NixOS/nixpkgs/issues/123851
|
# https://github.com/NixOS/nixpkgs/issues/123851
|
||||||
./fix-audio-driver-loading.patch
|
./fix-audio-driver-loading.patch
|
||||||
];
|
];
|
||||||
@ -130,14 +131,17 @@ in stdenv.mkDerivation {
|
|||||||
VBOX_JAVA_HOME := ${jdk}
|
VBOX_JAVA_HOME := ${jdk}
|
||||||
''}
|
''}
|
||||||
${optionalString (!headless) ''
|
${optionalString (!headless) ''
|
||||||
|
VBOX_WITH_VBOXSDL := 1
|
||||||
PATH_QT5_X11_EXTRAS_LIB := ${getLib qtx11extras}/lib
|
PATH_QT5_X11_EXTRAS_LIB := ${getLib qtx11extras}/lib
|
||||||
PATH_QT5_X11_EXTRAS_INC := ${getDev qtx11extras}/include
|
PATH_QT5_X11_EXTRAS_INC := ${getDev qtx11extras}/include
|
||||||
TOOL_QT5_LRC := ${getDev qttools}/bin/lrelease
|
PATH_QT5_TOOLS_LIB := ${getLib qttools}/lib
|
||||||
|
PATH_QT5_TOOLS_INC := ${getDev qttools}/include
|
||||||
''}
|
''}
|
||||||
${optionalString enableWebService ''
|
${optionalString enableWebService ''
|
||||||
# fix gsoap missing zlib include and produce errors with --as-needed
|
# fix gsoap missing zlib include and produce errors with --as-needed
|
||||||
VBOX_GSOAP_CXX_LIBS := gsoapssl++ z
|
VBOX_GSOAP_CXX_LIBS := gsoapssl++ z
|
||||||
''}
|
''}
|
||||||
|
TOOL_QT5_LRC := ${getDev qttools}/bin/lrelease
|
||||||
LOCAL_CONFIG
|
LOCAL_CONFIG
|
||||||
|
|
||||||
./configure \
|
./configure \
|
||||||
@ -174,7 +178,7 @@ in stdenv.mkDerivation {
|
|||||||
-name src -o -exec cp -avt "$libexec" {} +
|
-name src -o -exec cp -avt "$libexec" {} +
|
||||||
|
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
for file in ${optionalString (!headless) "VirtualBox VBoxSDL rdesktop-vrdp"} ${optionalString enableWebService "vboxwebsrv"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do
|
for file in ${optionalString (!headless) "VirtualBox VBoxSDL"} ${optionalString enableWebService "vboxwebsrv"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do
|
||||||
echo "Linking $file to /bin"
|
echo "Linking $file to /bin"
|
||||||
test -x "$libexec/$file"
|
test -x "$libexec/$file"
|
||||||
ln -s "$libexec/$file" $out/bin/$file
|
ln -s "$libexec/$file" $out/bin/$file
|
||||||
|
@ -12,7 +12,7 @@ fetchurl rec {
|
|||||||
# Manually sha256sum the extensionPack file, must be hex!
|
# Manually sha256sum the extensionPack file, must be hex!
|
||||||
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
|
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
|
||||||
# Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
|
# Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
|
||||||
let value = "29cf8410e2514ea4393f63f5e955b8311787873679fc23ae9a897fb70ef3f84a";
|
let value = "292961aa8723b54f96f89f6d8abf7d8e29259d94b7de831dbffb9ae15d346434";
|
||||||
in assert (builtins.stringLength value) == 64; value;
|
in assert (builtins.stringLength value) == 64; value;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
|
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
|
||||||
sha256 = "d456c559926f1a8fdd7259056e0a50f12339fd494122cf30db7736e2032970c6";
|
sha256 = "21e0f407d2a4f5c286084a70718aa20235ea75969eca0cab6cfab43a3499a010";
|
||||||
};
|
};
|
||||||
|
|
||||||
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
|
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
|
||||||
|
@ -7,10 +7,10 @@ index 71b96a3..73391f0 100644
|
|||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
- $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) )
|
- $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) )
|
||||||
+ $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(if $(filter X11Extras,$(module)),$(PATH_QT5_X11_EXTRAS_LIB),$(PATH_SDK_QT5_LIB))/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) )
|
+ $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(if $(filter Help,$(module)),$(PATH_QT5_TOOLS_LIB),$(if $(filter X11Extras,$(module)),$(PATH_QT5_X11_EXTRAS_LIB),$(PATH_SDK_QT5_LIB)))/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) )
|
||||||
endif
|
endif
|
||||||
- $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) )
|
- $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) )
|
||||||
+ $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) $(PATH_QT5_X11_EXTRAS_INC)/QtX11Extras )
|
+ $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) $(PATH_QT5_X11_EXTRAS_INC)/QtX11Extras $(PATH_QT5_TOOLS_INC))
|
||||||
endif
|
endif
|
||||||
$(eval $(target)_DEFS += $(foreach module,$(toupper $(qt_modules)), QT_$(module)_LIB) )
|
$(eval $(target)_DEFS += $(foreach module,$(toupper $(qt_modules)), QT_$(module)_LIB) )
|
||||||
|
|
@ -2,16 +2,15 @@
|
|||||||
, angr
|
, angr
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchpatch
|
|
||||||
, progressbar
|
, progressbar
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
, pythonRelaxDepsHook
|
, setuptools
|
||||||
, tqdm
|
, tqdm
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "angrop";
|
pname = "angrop";
|
||||||
version = "9.2.7";
|
version = "9.2.8";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
@ -19,20 +18,12 @@ buildPythonPackage rec {
|
|||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "angr";
|
owner = "angr";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-wIPk7Cz7FSPviPFBSLrBjLr9M0o3pyoJM7wiAhHrg9Q=";
|
hash = "sha256-zmWdGbFzwLDP7MUqEprZcIgA7lAdCrafWYohAehJyh0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
name = "compatibility-with-newer-angr.patch";
|
|
||||||
url = "https://github.com/angr/angrop/commit/23194ee4ecdcb7a7390ec04eb133786ec3f807b1.patch";
|
|
||||||
hash = "sha256-n9/oPUblUHSk81qwU129rnNOjsNViaegp6454CaDo+8=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pythonRelaxDepsHook
|
setuptools
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
@ -41,10 +32,6 @@ buildPythonPackage rec {
|
|||||||
tqdm
|
tqdm
|
||||||
];
|
];
|
||||||
|
|
||||||
pythonRelaxDeps = [
|
|
||||||
"angr"
|
|
||||||
];
|
|
||||||
|
|
||||||
# Tests have additional requirements, e.g., angr binaries
|
# Tests have additional requirements, e.g., angr binaries
|
||||||
# cle is executing the tests with the angr binaries already and is a requirement of angr
|
# cle is executing the tests with the angr binaries already and is a requirement of angr
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, urllib3
|
, urllib3
|
||||||
, geojson
|
, geojson
|
||||||
, isPy3k
|
, pythonOlder
|
||||||
, sqlalchemy
|
, sqlalchemy
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, pytz
|
, pytz
|
||||||
@ -13,7 +13,9 @@
|
|||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "crate";
|
pname = "crate";
|
||||||
version = "0.30.0";
|
version = "0.30.0";
|
||||||
disabled = !isPy3k;
|
format = "setuptools";
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
@ -32,8 +34,15 @@ buildPythonPackage rec {
|
|||||||
];
|
];
|
||||||
|
|
||||||
disabledTests = [
|
disabledTests = [
|
||||||
# network access
|
# the following tests require network access
|
||||||
"test_layer_from_uri"
|
"test_layer_from_uri"
|
||||||
|
"test_additional_settings"
|
||||||
|
"test_basic"
|
||||||
|
"test_cluster"
|
||||||
|
"test_default_settings"
|
||||||
|
"test_dynamic_http_port"
|
||||||
|
"test_environment_variables"
|
||||||
|
"test_verbosity"
|
||||||
];
|
];
|
||||||
|
|
||||||
disabledTestPaths = [
|
disabledTestPaths = [
|
||||||
@ -44,6 +53,7 @@ buildPythonPackage rec {
|
|||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/crate/crate-python";
|
homepage = "https://github.com/crate/crate-python";
|
||||||
description = "A Python client library for CrateDB";
|
description = "A Python client library for CrateDB";
|
||||||
|
changelog = "https://github.com/crate/crate-python/blob/${version}/CHANGES.txt";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ doronbehar ];
|
maintainers = with maintainers; [ doronbehar ];
|
||||||
};
|
};
|
||||||
|
33
pkgs/development/python-modules/execnb/default.nix
Normal file
33
pkgs/development/python-modules/execnb/default.nix
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
|
, fastcore
|
||||||
|
, traitlets
|
||||||
|
, ipython
|
||||||
|
, pythonOlder
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "execnb";
|
||||||
|
version = "0.1.4";
|
||||||
|
format = "setuptools";
|
||||||
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
sha256 = "sha256-y9gSvzJA8Fsh56HbA8SszlozsBBfTLfgWGDXm9uSBvA=";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ fastcore traitlets ipython ];
|
||||||
|
|
||||||
|
# no real tests
|
||||||
|
doCheck = false;
|
||||||
|
pythonImportsCheck = [ "execnb" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://github.com/fastai/execnb";
|
||||||
|
description = "Execute a jupyter notebook, fast, without needing jupyter";
|
||||||
|
license = licenses.asl20;
|
||||||
|
maintainers = with maintainers; [ rxiao ];
|
||||||
|
};
|
||||||
|
}
|
53
pkgs/development/python-modules/fastai/default.nix
Normal file
53
pkgs/development/python-modules/fastai/default.nix
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
|
, fastprogress
|
||||||
|
, fastcore
|
||||||
|
, fastdownload
|
||||||
|
, torch
|
||||||
|
, torchvision
|
||||||
|
, matplotlib
|
||||||
|
, pillow
|
||||||
|
, scikit-learn
|
||||||
|
, scipy
|
||||||
|
, spacy
|
||||||
|
, pandas
|
||||||
|
, requests
|
||||||
|
, pythonOlder
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "fastai";
|
||||||
|
version = "2.7.10";
|
||||||
|
format = "setuptools";
|
||||||
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
sha256 = "sha256-zO9qGFrjpjfvybzZ/qjki3X0VNDrrTtt9CbyL64gA50=";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
fastprogress
|
||||||
|
fastcore
|
||||||
|
fastdownload
|
||||||
|
torchvision
|
||||||
|
matplotlib
|
||||||
|
pillow
|
||||||
|
scikit-learn
|
||||||
|
scipy
|
||||||
|
spacy
|
||||||
|
pandas
|
||||||
|
requests
|
||||||
|
];
|
||||||
|
|
||||||
|
doCheck = false;
|
||||||
|
pythonImportsCheck = [ "fastai" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://github.com/fastai/fastai";
|
||||||
|
description = "The fastai deep learning library";
|
||||||
|
license = licenses.asl20;
|
||||||
|
maintainers = with maintainers; [ rxiao ];
|
||||||
|
};
|
||||||
|
}
|
32
pkgs/development/python-modules/fastdownload/default.nix
Normal file
32
pkgs/development/python-modules/fastdownload/default.nix
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
|
, fastprogress
|
||||||
|
, fastcore
|
||||||
|
, pythonOlder
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "fastdownload";
|
||||||
|
version = "0.0.6";
|
||||||
|
format = "setuptools";
|
||||||
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
sha256 = "sha256-1ayb0zx8rFKDgqlq/tVVLqDkh47T5jofHt53r8bWr30=";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ fastprogress fastcore ];
|
||||||
|
|
||||||
|
# no real tests
|
||||||
|
doCheck = false;
|
||||||
|
pythonImportsCheck = [ "fastdownload" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://github.com/fastai/fastdownload";
|
||||||
|
description = "Easily download, verify, and extract archives";
|
||||||
|
license = licenses.asl20;
|
||||||
|
maintainers = with maintainers; [ rxiao ];
|
||||||
|
};
|
||||||
|
}
|
36
pkgs/development/python-modules/nbdev/default.nix
Normal file
36
pkgs/development/python-modules/nbdev/default.nix
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
|
, fastprogress
|
||||||
|
, fastcore
|
||||||
|
, asttokens
|
||||||
|
, astunparse
|
||||||
|
, watchdog
|
||||||
|
, execnb
|
||||||
|
, ghapi
|
||||||
|
, pythonOlder
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "nbdev";
|
||||||
|
version = "2.3.11";
|
||||||
|
format = "setuptools";
|
||||||
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
sha256 = "sha256-ITMCmuAb1lXONbP5MREpk8vfNSztoTEmT87W1o+fbIU=";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ fastprogress fastcore asttokens astunparse watchdog execnb ghapi ];
|
||||||
|
# no real tests
|
||||||
|
doCheck = false;
|
||||||
|
pythonImportsCheck = [ "nbdev" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://github.com/fastai/nbdev";
|
||||||
|
description = "Create delightful software with Jupyter Notebooks";
|
||||||
|
license = licenses.asl20;
|
||||||
|
maintainers = with maintainers; [ rxiao ];
|
||||||
|
};
|
||||||
|
}
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pykeyatome";
|
pname = "pykeyatome";
|
||||||
version = "2.1.1";
|
version = "2.1.2";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||||||
owner = "jugla";
|
owner = "jugla";
|
||||||
repo = "pyKeyAtome";
|
repo = "pyKeyAtome";
|
||||||
rev = "refs/tags/V${version}";
|
rev = "refs/tags/V${version}";
|
||||||
hash = "sha256-/HfWPrpW4NowFmdmU2teIiex1O03bHemnUdhOoEDRgc=";
|
hash = "sha256-zRXUjekawf2/zTSlXqHVB02dDkb6HbU4NN6UBgl2rtg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
75
pkgs/development/python-modules/textnets/default.nix
Normal file
75
pkgs/development/python-modules/textnets/default.nix
Normal file
@ -0,0 +1,75 @@
|
|||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, cairocffi
|
||||||
|
, cython
|
||||||
|
, fetchFromGitHub
|
||||||
|
, igraph
|
||||||
|
, leidenalg
|
||||||
|
, pandas
|
||||||
|
, poetry-core
|
||||||
|
, pytestCheckHook
|
||||||
|
, pythonOlder
|
||||||
|
, scipy
|
||||||
|
, setuptools
|
||||||
|
, spacy
|
||||||
|
, en_core_web_sm
|
||||||
|
, toolz
|
||||||
|
, tqdm
|
||||||
|
, wasabi
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "textnets";
|
||||||
|
version = "0.8.7";
|
||||||
|
format = "pyproject";
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.8";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "jboynyc";
|
||||||
|
repo = pname;
|
||||||
|
rev = "refs/tags/v${version}";
|
||||||
|
hash = "sha256-BBndY+3leJBxiImuyRL7gMD5eocE4i96+97I9hDEwec=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
cython
|
||||||
|
poetry-core
|
||||||
|
setuptools
|
||||||
|
];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
cairocffi
|
||||||
|
igraph
|
||||||
|
leidenalg
|
||||||
|
pandas
|
||||||
|
scipy
|
||||||
|
spacy
|
||||||
|
toolz
|
||||||
|
tqdm
|
||||||
|
wasabi
|
||||||
|
];
|
||||||
|
|
||||||
|
# Deselect test of experimental feature that fails due to having an
|
||||||
|
# additional dependency.
|
||||||
|
disabledTests = [
|
||||||
|
"test_context"
|
||||||
|
];
|
||||||
|
|
||||||
|
nativeCheckInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
en_core_web_sm
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [
|
||||||
|
"textnets"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Text analysis with networks";
|
||||||
|
homepage = "https://textnets.readthedocs.io";
|
||||||
|
changelog = "https://github.com/jboynyc/textnets/blob/v${version}/HISTORY.rst";
|
||||||
|
license = licenses.gpl3Only;
|
||||||
|
maintainers = with maintainers; [ jboy ];
|
||||||
|
};
|
||||||
|
}
|
@ -12,16 +12,16 @@
|
|||||||
# server, and the FHS userenv and corresponding NixOS module should
|
# server, and the FHS userenv and corresponding NixOS module should
|
||||||
# automatically pick up the changes.
|
# automatically pick up the changes.
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "1.31.0.6654-02189b09f";
|
version = "1.31.1.6733-bc0674160";
|
||||||
pname = "plexmediaserver";
|
pname = "plexmediaserver";
|
||||||
|
|
||||||
# Fetch the source
|
# Fetch the source
|
||||||
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
|
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
|
||||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
|
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
|
||||||
sha256 = "sha256-ttkvYD+ALxfZpQutI1VyTbmQi/7hmvZ+YMUv3lskeWU=";
|
sha256 = "0nj9n250lhin58xlqvn2l0pjxdbajj0bla2wrgan8gs2m45nk3q9";
|
||||||
} else fetchurl {
|
} else fetchurl {
|
||||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
||||||
sha256 = "sha256-TTEcyIBFiuJTNHeJ9wu+4o2ol72oCvM9FdDPC83J3Mc=";
|
sha256 = "0a5h151gh1ja3frqzaqw3pj1kyh5p0wgnfmmxiz0q3zx1drjs611";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "basedb" ];
|
outputs = [ "out" "basedb" ];
|
||||||
|
@ -54,7 +54,7 @@ let
|
|||||||
homepage = "https://github.com/sigstore/rekor";
|
homepage = "https://github.com/sigstore/rekor";
|
||||||
changelog = "https://github.com/sigstore/rekor/releases/tag/v${version}";
|
changelog = "https://github.com/sigstore/rekor/releases/tag/v${version}";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ lesuisse jk ];
|
maintainers = with maintainers; [ lesuisse jk developer-guy ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
|
@ -6,16 +6,16 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "vault";
|
pname = "vault";
|
||||||
version = "1.12.3";
|
version = "1.13.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hashicorp";
|
owner = "hashicorp";
|
||||||
repo = "vault";
|
repo = "vault";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-ZNk9bmZwD1aUY3fYT5Qngoq+9qXgvH/nWSWc30st7nE=";
|
sha256 = "sha256-F9Ki+3jMkJ+CI2yQmrnqT98xJqSSKQTtYHxQTYdfNbQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-sPpTB3N1w0JppHcwdyLYwSxjzzUAJcBJ5zJ2u4rXXkQ=";
|
vendorHash = "sha256-Ny4TTa67x/mwTclZrtPoWU6nHu5q4KafP1s4rvk21Hs=";
|
||||||
|
|
||||||
subPackages = [ "." ];
|
subPackages = [ "." ];
|
||||||
|
|
||||||
|
@ -3195,6 +3195,8 @@ self: super: with self; {
|
|||||||
|
|
||||||
exchangelib = callPackage ../development/python-modules/exchangelib { };
|
exchangelib = callPackage ../development/python-modules/exchangelib { };
|
||||||
|
|
||||||
|
execnb = callPackage ../development/python-modules/execnb { };
|
||||||
|
|
||||||
execnet = callPackage ../development/python-modules/execnet { };
|
execnet = callPackage ../development/python-modules/execnet { };
|
||||||
|
|
||||||
executing = callPackage ../development/python-modules/executing { };
|
executing = callPackage ../development/python-modules/executing { };
|
||||||
@ -3280,6 +3282,8 @@ self: super: with self; {
|
|||||||
|
|
||||||
faraday-plugins = callPackage ../development/python-modules/faraday-plugins { };
|
faraday-plugins = callPackage ../development/python-modules/faraday-plugins { };
|
||||||
|
|
||||||
|
fastai = callPackage ../development/python-modules/fastai { };
|
||||||
|
|
||||||
fastapi = callPackage ../development/python-modules/fastapi { };
|
fastapi = callPackage ../development/python-modules/fastapi { };
|
||||||
|
|
||||||
fastapi-mail = callPackage ../development/python-modules/fastapi-mail { };
|
fastapi-mail = callPackage ../development/python-modules/fastapi-mail { };
|
||||||
@ -3294,6 +3298,8 @@ self: super: with self; {
|
|||||||
|
|
||||||
fastdiff = callPackage ../development/python-modules/fastdiff { };
|
fastdiff = callPackage ../development/python-modules/fastdiff { };
|
||||||
|
|
||||||
|
fastdownload = callPackage ../development/python-modules/fastdownload { };
|
||||||
|
|
||||||
fastdtw = callPackage ../development/python-modules/fastdtw { };
|
fastdtw = callPackage ../development/python-modules/fastdtw { };
|
||||||
|
|
||||||
fastecdsa = callPackage ../development/python-modules/fastecdsa { };
|
fastecdsa = callPackage ../development/python-modules/fastecdsa { };
|
||||||
@ -6305,6 +6311,8 @@ self: super: with self; {
|
|||||||
|
|
||||||
nbconvert = callPackage ../development/python-modules/nbconvert { };
|
nbconvert = callPackage ../development/python-modules/nbconvert { };
|
||||||
|
|
||||||
|
nbdev = callPackage ../development/python-modules/nbdev { };
|
||||||
|
|
||||||
nbdime = callPackage ../development/python-modules/nbdime { };
|
nbdime = callPackage ../development/python-modules/nbdime { };
|
||||||
|
|
||||||
nbformat = callPackage ../development/python-modules/nbformat { };
|
nbformat = callPackage ../development/python-modules/nbformat { };
|
||||||
@ -11512,6 +11520,10 @@ self: super: with self; {
|
|||||||
|
|
||||||
textacy = callPackage ../development/python-modules/textacy { };
|
textacy = callPackage ../development/python-modules/textacy { };
|
||||||
|
|
||||||
|
textnets = callPackage ../development/python-modules/textnets {
|
||||||
|
en_core_web_sm = spacy_models.en_core_web_sm;
|
||||||
|
};
|
||||||
|
|
||||||
texttable = callPackage ../development/python-modules/texttable { };
|
texttable = callPackage ../development/python-modules/texttable { };
|
||||||
|
|
||||||
text-unidecode = callPackage ../development/python-modules/text-unidecode { };
|
text-unidecode = callPackage ../development/python-modules/text-unidecode { };
|
||||||
|
@ -199,8 +199,8 @@ let
|
|||||||
|
|
||||||
# All packages built with the Musl libc. This will override the
|
# All packages built with the Musl libc. This will override the
|
||||||
# default GNU libc on Linux systems. Non-Linux systems are not
|
# default GNU libc on Linux systems. Non-Linux systems are not
|
||||||
# supported.
|
# supported. 32-bit is also not supported.
|
||||||
pkgsMusl = if stdenv.hostPlatform.isLinux then nixpkgsFun {
|
pkgsMusl = if stdenv.hostPlatform.isLinux && stdenv.buildPlatform.is64bit then nixpkgsFun {
|
||||||
overlays = [ (self': super': {
|
overlays = [ (self': super': {
|
||||||
pkgsMusl = super';
|
pkgsMusl = super';
|
||||||
})] ++ overlays;
|
})] ++ overlays;
|
||||||
@ -208,7 +208,7 @@ let
|
|||||||
then "localSystem" else "crossSystem"} = {
|
then "localSystem" else "crossSystem"} = {
|
||||||
parsed = makeMuslParsedPlatform stdenv.hostPlatform.parsed;
|
parsed = makeMuslParsedPlatform stdenv.hostPlatform.parsed;
|
||||||
};
|
};
|
||||||
} else throw "Musl libc only supports Linux systems.";
|
} else throw "Musl libc only supports 64-bit Linux systems.";
|
||||||
|
|
||||||
# All packages built for i686 Linux.
|
# All packages built for i686 Linux.
|
||||||
# Used by wine, firefox with debugging version of Flash, ...
|
# Used by wine, firefox with debugging version of Flash, ...
|
||||||
|
Loading…
Reference in New Issue
Block a user