mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-25 17:55:21 +00:00
Merge release-22.05 into staging-next-22.05
This commit is contained in:
github-actions[bot]
@@ -633,8 +633,13 @@ in {
|
||||
|
||||
services.nextcloud.phpPackage =
|
||||
if versionOlder cfg.package.version "21" then pkgs.php74
|
||||
else if versionOlder cfg.package.version "24" then pkgs.php80
|
||||
else pkgs.php81;
|
||||
# FIXME: Use PHP 8.1 with Nextcloud 24 and higher, once issues like this one are fixed:
|
||||
#
|
||||
# https://github.com/nextcloud/twofactor_totp/issues/1192
|
||||
#
|
||||
# else if versionOlder cfg.package.version "24" then pkgs.php80
|
||||
# else pkgs.php81;
|
||||
else pkgs.php80;
|
||||
}
|
||||
|
||||
{ assertions = [
|
||||
|
||||
@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
|
||||
cp makefiles/makefile.defs.linux.pulse makefile.defs
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"AR=${stdenv.cc.targetPrefix}ar"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
install -Dt $out/bin praat
|
||||
'';
|
||||
|
||||
@@ -103,6 +103,7 @@
|
||||
, crashreporterSupport ? !privacySupport
|
||||
, geolocationSupport ? !privacySupport
|
||||
, googleAPISupport ? geolocationSupport
|
||||
, mlsAPISupport ? geolocationSupport
|
||||
, webrtcSupport ? !privacySupport
|
||||
|
||||
# digital rights managemewnt
|
||||
@@ -185,6 +186,18 @@ let
|
||||
};
|
||||
});
|
||||
|
||||
defaultPrefs = {
|
||||
"geo.provider.network.url" = {
|
||||
value = "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%";
|
||||
reason = "Use MLS by default for geolocation, since our Google API Keys are not working";
|
||||
};
|
||||
};
|
||||
|
||||
defaultPrefsFile = pkgs.writeText "nixos-default-prefs.js" (lib.concatStringsSep "\n" (lib.mapAttrsToList (key: value: ''
|
||||
// ${value.reason}
|
||||
pref("${key}", ${builtins.toJSON value.value});
|
||||
'') defaultPrefs));
|
||||
|
||||
in
|
||||
|
||||
buildStdenv.mkDerivation ({
|
||||
@@ -304,11 +317,17 @@ buildStdenv.mkDerivation ({
|
||||
'' + lib.optionalString googleAPISupport ''
|
||||
# Google API key used by Chromium and Firefox.
|
||||
# Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
|
||||
# please get your own set of keys.
|
||||
echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" > $TMPDIR/ga
|
||||
# please get your own set of keys at https://www.chromium.org/developers/how-tos/api-keys/.
|
||||
echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" > $TMPDIR/google-api-key
|
||||
# 60.5+ & 66+ did split the google API key arguments: https://bugzilla.mozilla.org/show_bug.cgi?id=1531176
|
||||
configureFlagsArray+=("--with-google-location-service-api-keyfile=$TMPDIR/ga")
|
||||
configureFlagsArray+=("--with-google-safebrowsing-api-keyfile=$TMPDIR/ga")
|
||||
configureFlagsArray+=("--with-google-location-service-api-keyfile=$TMPDIR/google-api-key")
|
||||
configureFlagsArray+=("--with-google-safebrowsing-api-keyfile=$TMPDIR/google-api-key")
|
||||
'' + lib.optionalString mlsAPISupport ''
|
||||
# Mozilla Location services API key
|
||||
# Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
|
||||
# please get your own set of keys at https://location.services.mozilla.com/api.
|
||||
echo "dfd7836c-d458-4917-98bb-421c82d3c8a0" > $TMPDIR/mls-api-key
|
||||
configureFlagsArray+=("--with-mozilla-api-keyfile=$TMPDIR/mls-api-key")
|
||||
'' + lib.optionalString enableOfficialBranding ''
|
||||
export MOZILLA_OFFICIAL=1
|
||||
'';
|
||||
@@ -467,6 +486,7 @@ buildStdenv.mkDerivation ({
|
||||
postInstall = ''
|
||||
# Install distribution customizations
|
||||
install -Dvm644 ${distributionIni} $out/lib/${binaryName}/distribution/distribution.ini
|
||||
install -Dvm644 ${defaultPrefsFile} $out/lib/${binaryName}/browser/defaults/preferences/nixos-default-prefs.js
|
||||
|
||||
'' + lib.optionalString buildStdenv.isLinux ''
|
||||
# Remove SDK cruft. FIXME: move to a separate output?
|
||||
|
||||
@@ -87,7 +87,7 @@ let
|
||||
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
|
||||
|
||||
# Upstream source
|
||||
version = "11.0.11";
|
||||
version = "11.0.13";
|
||||
|
||||
lang = "en-US";
|
||||
|
||||
@@ -98,7 +98,7 @@ let
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
];
|
||||
sha256 = "1dx92jdnvs7w52mps4zhnnjym6jsl9vwfiav1jw8qq0g8hslgybd";
|
||||
sha256 = "03pzwzgikc43pm0lga61jdzg46fanmvd1wsnb2xkq0y1ny8gsqfz";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
@@ -107,7 +107,7 @@ let
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
];
|
||||
sha256 = "165mg9gwmlqwskbk3i8lhjjqp4lmpq5vzdvd9zalx69xqh9v85i5";
|
||||
sha256 = "0j8h2g404sagzjxnwf55n8hpvmwk52qhml98nyliajf1xg8v8k19";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@@ -15,8 +15,26 @@ let
|
||||
version = "1.16.0";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
extension = "zip";
|
||||
sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01";
|
||||
};
|
||||
# Needs networking for some tests
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
# The bravado-core dependency is incompatible with jschonschema 4.0:
|
||||
# https://github.com/Yelp/bravado-core/pull/385
|
||||
jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "3.2.0";
|
||||
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
doCheck = false;
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,14 +1,12 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
, python3
|
||||
, vala
|
||||
, desktop-file-utils
|
||||
, gtk3
|
||||
, libxml2
|
||||
, libhandy
|
||||
@@ -16,36 +14,25 @@
|
||||
, folks
|
||||
, libgdata
|
||||
, sqlite
|
||||
, glib-networking
|
||||
, granite
|
||||
, evolution-data-server
|
||||
, appstream
|
||||
, wrapGAppsHook
|
||||
, libgee
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-mail";
|
||||
version = "6.4.0";
|
||||
version = "7.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "mail";
|
||||
rev = version;
|
||||
sha256 = "sha256-ooqVNMgeAqGlFcfachPPfhSiKTEEcNGv5oWdM7VLWOc=";
|
||||
sha256 = "sha256-DO3nybH7tb/ISrSQ3+Oj612m64Ov6X0GAWePMbKjCc4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with vala 0.56
|
||||
# https://github.com/elementary/mail/pull/765
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/mail/commit/c3aa61d226f49147d7685cc00013469ff4df369a.patch";
|
||||
sha256 = "sha256-OxNBGIC1hrEaFSufQ59Wb0AMfdzqPt6diL4g3hbL/Ig=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream
|
||||
desktop-file-utils
|
||||
libxml2
|
||||
meson
|
||||
ninja
|
||||
@@ -58,6 +45,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
evolution-data-server
|
||||
folks
|
||||
glib-networking
|
||||
granite
|
||||
gtk3
|
||||
libgdata
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pantheon-tweaks";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pantheon-tweaks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Pn/MIJ/WS/TY5bemM77B37E0KFRlDUfrOl1XS2yJlGk=";
|
||||
sha256 = "sha256-L/3PrkfWOGYtqeH/DajGEGCsF5yYnWuESxUTfROSHQ4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, perl
|
||||
, CoreServices
|
||||
, ApplicationServices
|
||||
@@ -15,6 +16,16 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-+3HNE5EkZEgrmbM/DAbp/XxRoVHG5jKpIgz5PFhV/a8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "mimalloc-older-macos-fixes.patch";
|
||||
url = "https://github.com/microsoft/mimalloc/commit/40e0507a5959ee218f308d33aec212c3ebeef3bb.patch";
|
||||
stripLen = 1;
|
||||
extraPrefix = "3rdparty/mimalloc/";
|
||||
sha256 = "1gcbn1850vy7xzalhn9ffnsg6x1ywi3fmnxvnal3m6lmb4kz5kb1";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
|
||||
@@ -1,76 +1,86 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, isPy27, fetchpatch
|
||||
{ lib
|
||||
, alembic
|
||||
, buildPythonPackage
|
||||
, click
|
||||
, cloudpickle
|
||||
, requests
|
||||
, six
|
||||
, flask
|
||||
, numpy
|
||||
, scipy
|
||||
, pandas
|
||||
, python-dateutil
|
||||
, protobuf
|
||||
, GitPython
|
||||
, pyyaml
|
||||
, querystring_parser
|
||||
, simplejson
|
||||
, docker
|
||||
, databricks-cli
|
||||
, docker
|
||||
, entrypoints
|
||||
, sqlparse
|
||||
, sqlalchemy
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, flask
|
||||
, GitPython
|
||||
, gorilla
|
||||
, gunicorn
|
||||
, prometheus-flask-exporter
|
||||
, importlib-metadata
|
||||
, numpy
|
||||
, packaging
|
||||
, pandas
|
||||
, prometheus-flask-exporter
|
||||
, protobuf
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, querystring_parser
|
||||
, requests
|
||||
, scipy
|
||||
, simplejson
|
||||
, six
|
||||
, sqlalchemy
|
||||
, sqlparse
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mlflow";
|
||||
version = "1.25.1";
|
||||
disabled = isPy27;
|
||||
version = "1.26.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-jDePRRbWNz+VvFe2x8LcpD8mUNSc7lq2ucNFf8RvBgA=";
|
||||
hash = "sha256-2D1glQkovCY0lN0kfxGeoLigTkkPpij13mTeou7CAw4=";
|
||||
};
|
||||
|
||||
# run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config
|
||||
# also, tests use conda so can't run on NixOS without buildFHSUserEnv
|
||||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
alembic
|
||||
click
|
||||
cloudpickle
|
||||
requests
|
||||
six
|
||||
flask
|
||||
numpy
|
||||
scipy
|
||||
pandas
|
||||
python-dateutil
|
||||
protobuf
|
||||
GitPython
|
||||
pyyaml
|
||||
querystring_parser
|
||||
simplejson
|
||||
docker
|
||||
databricks-cli
|
||||
docker
|
||||
entrypoints
|
||||
sqlparse
|
||||
sqlalchemy
|
||||
flask
|
||||
GitPython
|
||||
gorilla
|
||||
gunicorn
|
||||
prometheus-flask-exporter
|
||||
importlib-metadata
|
||||
numpy
|
||||
packaging
|
||||
pandas
|
||||
prometheus-flask-exporter
|
||||
protobuf
|
||||
python-dateutil
|
||||
pyyaml
|
||||
querystring_parser
|
||||
requests
|
||||
scipy
|
||||
simplejson
|
||||
six
|
||||
sqlalchemy
|
||||
sqlparse
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "mlflow" ];
|
||||
pythonImportsCheck = [
|
||||
"mlflow"
|
||||
];
|
||||
|
||||
# run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config
|
||||
# also, tests use conda so can't run on NixOS without buildFHSUserEnv
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mlflow/mlflow";
|
||||
description = "Open source platform for the machine learning lifecycle";
|
||||
homepage = "https://github.com/mlflow/mlflow";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ tbenst ];
|
||||
};
|
||||
|
||||
@@ -5,17 +5,21 @@
|
||||
, pyparsing
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyhocon";
|
||||
version = "0.3.59";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chimpler";
|
||||
repo = "pyhocon";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1yr24plg3d4girg27ajjkf9mndig706fs8b2kmnmhi4l2xi866yh";
|
||||
sha256 = "sha256-0BuDYheURFhtnWIh7Qw4LzZbk5tSqiNejo+08eglIvs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -28,18 +32,36 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyhocon" ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "pyparsing~=2.0" "pyparsing>=2.0"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyhocon"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# pyparsing.exceptions.ParseException: Expected end of text, found '='
|
||||
# https://github.com/chimpler/pyhocon/issues/273
|
||||
"tests/test_tool.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# AssertionError: assert ConfigTree([(...
|
||||
"test_dict_merge"
|
||||
"test_parse_override"
|
||||
"test_include_dict"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/chimpler/pyhocon/";
|
||||
description = "HOCON parser for Python";
|
||||
# taken from https://pypi.org/project/pyhocon/
|
||||
homepage = "https://github.com/chimpler/pyhocon/";
|
||||
longDescription = ''
|
||||
A HOCON parser for Python. It additionally provides a tool
|
||||
(pyhocon) to convert any HOCON content into json, yaml and properties
|
||||
format
|
||||
A HOCON parser for Python. It additionally provides a tool (pyhocon) to convert
|
||||
any HOCON content into JSON, YAML and properties format.
|
||||
'';
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.chreekat ];
|
||||
maintainers = with maintainers; [ chreekat ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,12 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, numpy, pillow, zbar, pytestCheckHook }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
, pillow
|
||||
, zbar
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyzbar";
|
||||
@@ -19,7 +27,9 @@ buildPythonPackage rec {
|
||||
# https://github.com/NixOS/nixpkgs/issues/7307
|
||||
postPatch = ''
|
||||
substituteInPlace pyzbar/zbar_library.py \
|
||||
--replace "find_library('zbar')" "'${lib.getLib zbar}/lib/libzbar.so.0'"
|
||||
--replace \
|
||||
"find_library('zbar')" \
|
||||
'"${lib.getLib zbar}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"'
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
|
||||
@@ -85,6 +85,7 @@ buildPythonPackage rec {
|
||||
"qiskit.providers.aer.backends.qasm_simulator"
|
||||
"qiskit.providers.aer.backends.controller_wrappers" # Checks C++ files built correctly. Only exists if built & moved to output
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# these tests don't work with cvxpy >= 1.1.15
|
||||
"test_clifford"
|
||||
@@ -113,16 +114,20 @@ buildPythonPackage rec {
|
||||
"_144"
|
||||
"test_sparse_output_probabilities"
|
||||
"test_reset_2_qubit"
|
||||
|
||||
# Fails with 0.10.4
|
||||
"test_extended_stabilizer_sparse_output_probs"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
ddt
|
||||
fixtures
|
||||
pytest-timeout
|
||||
qiskit-terra
|
||||
setuptools # temporary workaround for pbr missing setuptools, see https://github.com/NixOS/nixpkgs/pull/132614
|
||||
testtools
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"--timeout=30"
|
||||
"--durations=10"
|
||||
@@ -137,6 +142,7 @@ buildPythonPackage rec {
|
||||
# Add qiskit-aer compiled files to cython include search
|
||||
pushd $HOME
|
||||
'';
|
||||
|
||||
postCheck = "popd";
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,18 +1,32 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, attrs, pytestCheckHook }:
|
||||
{ lib
|
||||
, attrs
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sumtypes";
|
||||
version = "0.1a5";
|
||||
version = "0.1a6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radix";
|
||||
repo = "sumtypes";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0wcw1624xxx2h6lliv13b59blg60j8sgf5v2ni3cwx3j4wld4csr";
|
||||
sha256 = "sha256-qwQyFKVnGEqHUqFmUSnHVvedsp2peM6rJZcS90paLOo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ attrs ];
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Algebraic data types for Python";
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, isPy27
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, scipy
|
||||
, sparse
|
||||
}:
|
||||
@@ -11,32 +11,51 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "tensorly";
|
||||
version = "0.7.0";
|
||||
disabled = isPy27;
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "VcX3pCczZQUYZaD7xrrkOcj0QPJt28cYTwpZm5D/X3c=";
|
||||
sha256 = "sha256-VcX3pCczZQUYZaD7xrrkOcj0QPJt28cYTwpZm5D/X3c=";
|
||||
};
|
||||
|
||||
# nose is not actually required for anything
|
||||
# (including testing with the minimal dependencies)
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
scipy
|
||||
sparse
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace ", 'nose'" ""
|
||||
# nose is not actually required for anything
|
||||
# (including testing with the minimal dependencies)
|
||||
substituteInPlace setup.py \
|
||||
--replace ", 'nose'" ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ numpy scipy sparse ];
|
||||
pythonImportsCheck = [
|
||||
"tensorly"
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
pytestFlagsArray = [ "tensorly" ];
|
||||
pytestFlagsArray = [
|
||||
"tensorly"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "tensorly" ];
|
||||
disabledTests = [
|
||||
# AssertionError: Partial_SVD took too long, maybe full_matrices set wrongly
|
||||
"test_svd_time"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tensor learning in Python";
|
||||
homepage = "https://tensorly.org/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.bcdarwin ];
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
let
|
||||
pname = "dump_syms";
|
||||
version = "unstable-2022-05-05";
|
||||
version = "1.0.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
@@ -19,11 +19,11 @@ rustPlatform.buildRustPackage {
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = pname;
|
||||
rev = "c2743d59b5aa321ade698f84b90f86b3d35a1b06";
|
||||
hash = "sha256-hWK9KrYqbfrF8b7i33InlTa/XkoZs+h49kUsKeSaAok=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cgLlCNNid7JIukdWKy3nPJwyZ84YpKrnCC4Rm6E7DDk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256:0vsr867nl156wpxpw01bv9fxsp6rhj9vvpz2i2yhx4kjgr1qk1kw";
|
||||
cargoSha256 = "sha256-0qRaBgIoWXYnQkxY7hFkvj3v/7mEGGRzQV7JFib8JRk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Linux driver for setting the backlight brightness on laptops using NVIDIA GPU";
|
||||
homepage = "https://github.com/guillaumezin/nvidiabl";
|
||||
homepage = "https://github.com/yorickvP/nvidiabl";
|
||||
license = licenses.gpl2;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
maintainers = with maintainers; [ yorickvp ];
|
||||
|
||||
@@ -41,5 +41,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://gp2x.org/adtool";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
broken = true; # does not link against recent libldap versions and unmaintained since 2017
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, python3, git }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, ninja, python3, git }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "directx-shader-compiler";
|
||||
version = "1.6.2106";
|
||||
version = "1.6.2112";
|
||||
|
||||
# Put headers in dev, there are lot of them which aren't necessary for
|
||||
# using the compiler binary.
|
||||
@@ -12,20 +12,13 @@ stdenv.mkDerivation rec {
|
||||
owner = "microsoft";
|
||||
repo = "DirectXShaderCompiler";
|
||||
rev = "v${version}";
|
||||
sha256 = "6kQgAESYiQ06LkiGTfDBYwd/ORLSm1W+BcO+OUp4yXY=";
|
||||
# We rely on the side effect of leaving the .git directory here for the
|
||||
# version-grabbing functionality of the build system.
|
||||
hash = "sha256-+oh7oWJCE0CLehnqpE2J9aIfMFbtfLAKwI9ETmCg/TA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake git python3 ];
|
||||
nativeBuildInputs = [ cmake git ninja python3 ];
|
||||
|
||||
configurePhase = ''
|
||||
# Requires some additional flags to cmake from a file in the repo
|
||||
additionalCMakeFlags=$(< utils/cmake-predefined-config-params)
|
||||
cmakeFlags="$additionalCMakeFlags''${cmakeFlags:+ $cmakeFlags}"
|
||||
cmakeConfigurePhase
|
||||
'';
|
||||
cmakeFlags = [ "-C../cmake/caches/PredefinedParams.cmake" ];
|
||||
|
||||
# The default install target installs heaps of LLVM stuff.
|
||||
#
|
||||
@@ -45,6 +38,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/microsoft/DirectXShaderCompiler";
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
license = licenses.ncsa;
|
||||
maintainers = with maintainers; [ expipiplus1 ];
|
||||
maintainers = with maintainers; [ expipiplus1 Flakebi ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -4,18 +4,30 @@
|
||||
}:
|
||||
|
||||
let
|
||||
bech32 = with python3Packages; buildPythonPackage rec {
|
||||
pname = "bech32";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-fW24IUYDvXhx/PpsCCbvaLhbCr2Q+iHChanF4h0r2Jk=";
|
||||
};
|
||||
};
|
||||
|
||||
# onlykey requires a patched version of libagent
|
||||
lib-agent = with python3Packages; libagent.overridePythonAttrs (oa: rec{
|
||||
version = "1.0.2";
|
||||
version = "1.0.4";
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "lib-agent";
|
||||
sha256 = "sha256-NAimivO3m4UUPM4JgLWGq2FbXOaXdQEL/DqZAcy+kEw=";
|
||||
sha256 = "sha256-MwtufyJVPWuK7bbX+9Kv6wEi/zq4ftXrfjrMOYpcIfc=";
|
||||
};
|
||||
propagatedBuildInputs = oa.propagatedBuildInputs or [ ] ++ [
|
||||
pynacl
|
||||
bech32
|
||||
cryptography
|
||||
docutils
|
||||
pycryptodome
|
||||
pynacl
|
||||
wheel
|
||||
];
|
||||
|
||||
@@ -32,11 +44,11 @@ let
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "onlykey-agent";
|
||||
version = "1.1.11";
|
||||
version = "1.1.13";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-YH/cqQOVy5s6dTp2JwxM3s4xRTXgwhOr00whtHAwZZI=";
|
||||
sha256 = "sha256-GAb6crtW6rLAbFtdi6fAGCPjXpKFhravguoGjuNcIxc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ lib-agent onlykey-cli ];
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "onlykey-cli";
|
||||
version = "1.2.5";
|
||||
version = "1.2.9";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit version;
|
||||
pname = "onlykey";
|
||||
sha256 = "sha256-7Pr1gXaPF5mctGxDciKKj0YDDQVFFi1+t6QztoKqpAA=";
|
||||
sha256 = "sha256-92CzDZgtmww0eABtjeBo6HNQ00sijWakjXLPJiOXY/A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
||||
1718
pkgs/tools/security/onlykey/node-packages.nix
generated
1718
pkgs/tools/security/onlykey/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@@ -1,4 +1,4 @@
|
||||
# This file has been generated by node2nix 1.9.0. Do not edit!
|
||||
# This file has been generated by node2nix 1.11.1. Do not edit!
|
||||
|
||||
{pkgs ? import <nixpkgs> {
|
||||
inherit system;
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
[
|
||||
{"onlykey": "git+https://github.com/trustcrypto/OnlyKey-App.git#v5.3.3"}
|
||||
{"onlykey": "git+https://github.com/trustcrypto/OnlyKey-App.git#v5.3.4"}
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user