Merge master into staging-next
This commit is contained in:
commit
e19bb47d10
|
@ -38,13 +38,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.160.2";
|
||||
version = "1.161.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
sha256 = "sha256-moKuiW5kd0jdAk0lBLX8ZWeT/locxGAvM4oOqvMGsr4=";
|
||||
sha256 = "sha256-FxeJpKc++fDHdYuYmjL6qY/rilA++ljcB/9U54+/+P0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -16,8 +16,8 @@
|
|||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.04.06",
|
||||
"sha256": "sha256-EnPOAl1qsdcYzmUgT5rSYqY/xOLSfDcMNCXIG8LC4H0="
|
||||
"rev": "2022.04.11",
|
||||
"sha256": "sha256-CoNjxQSQJhtVvvO9fJBGmfjbWhwZJ31Jk0YcISKqKiU="
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
|
@ -26,13 +26,13 @@
|
|||
},
|
||||
"EControl": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.04.08",
|
||||
"sha256": "sha256-pPlb8rr5loYVzKw/7R2kogSAosmViwGM3cehVwf4EYY="
|
||||
"rev": "2022.04.11.1",
|
||||
"sha256": "sha256-QwxnP7zY5AaMBqe2qH2l8lrfD6JQ+RNY5sucwL+o1Ts="
|
||||
},
|
||||
"ATSynEdit_Ex": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.03.28",
|
||||
"sha256": "sha256-TpAaL7/bhnrQgAq1mUTdEWXecSmznWy/iAw+TMMrQGo="
|
||||
"rev": "2022.04.11",
|
||||
"sha256": "sha256-wzE6lNhrXsBOP+Zx+qAcj6Hhf87qqDaqKf9up7I3ZUo="
|
||||
},
|
||||
"Python-for-Lazarus": {
|
||||
"owner": "Alexey-T",
|
||||
|
|
|
@ -50,6 +50,14 @@ stdenv.mkDerivation rec {
|
|||
url = "https://github.com/chernandezba/zesarux/commit/4493439b38f565c5be7c36239ecaf0cf80045627.diff";
|
||||
sha256 = "sha256-f+21naPcPXdcVvqU8ymlGfl1WkYGOeOBe9B/WFUauTI=";
|
||||
})
|
||||
|
||||
# Patch pending upstream release for libcaca-0.99.beta20 support:
|
||||
# https://github.com/chernandezba/zesarux/pull/1
|
||||
(fetchpatch {
|
||||
name = "libcaca-0.99.beta20.patch";
|
||||
url = "https://github.com/chernandezba/zesarux/commit/542786338d00ab6fcdf712bbd6f5e891e8b26c34.diff";
|
||||
sha256 = "sha256-UvXvBb9Nzw5HNz0uiv2SV1Oeiw7aVCa0jhEbThDRVec=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "slides";
|
||||
version = "0.7.3";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maaslalani";
|
||||
repo = "slides";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-05geDWZSpFjLywuWkI+FPaTaO9dyNuPuMBk7dc1Yl6I=";
|
||||
sha256 = "sha256-Ca0/M4B6yAdV4hbJ95gH9MVZg3EFIY5bSMkkYy2+P+Q=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
@ -21,7 +21,7 @@ buildGoModule rec {
|
|||
go
|
||||
];
|
||||
|
||||
vendorSha256 = "sha256-i+bbSwiH7TD+huxpTREThxnPkQZTMQJO7AP4kTlCseo=";
|
||||
vendorSha256 = "sha256-pn7c/6RF/GpECQtaxsTau91T7pLg+ZAUBbnR7h8DfnY=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
@ -32,7 +32,8 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
description = "Terminal based presentation tool";
|
||||
homepage = "https://github.com/maaslalani/slides";
|
||||
changelog = "https://github.com/maaslalani/slides/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ maaslalani ];
|
||||
maintainers = with maintainers; [ maaslalani penguwin ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@ let
|
|||
versions = if stdenv.isLinux then {
|
||||
stable = "0.0.17";
|
||||
ptb = "0.0.29";
|
||||
canary = "0.0.134";
|
||||
canary = "0.0.135";
|
||||
} else {
|
||||
stable = "0.0.264";
|
||||
ptb = "0.0.59";
|
||||
|
@ -31,7 +31,7 @@ let
|
|||
canary = fetchurl {
|
||||
url =
|
||||
"https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||
sha256 = "sha256-HyJa6lGcKMPKWffO/pnNcn8fDTJj6O4J8Y5RA23a1kM=";
|
||||
sha256 = "sha256-dmG+3BWS1BMHHQAv4fsXuObVeAJBeD+TqnyQz69AMac=";
|
||||
};
|
||||
};
|
||||
x86_64-darwin = {
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asdf-standard";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "asdf_standard";
|
||||
inherit version;
|
||||
hash = "sha256-HK8GceEm9K7DETreG1BjhYNpp2klXPu7vNLWfazFtZI=";
|
||||
hash = "sha256-Ic/AXdghVZtn37xU0DsrzArYtstcydFNdZH3OrNFFwA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -14,32 +14,45 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "22.3.2";
|
||||
pname = "BoltzTraP2";
|
||||
pname = "boltztrap2";
|
||||
version = "22.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Yo37xdXxCQKkA+lrFEZp1DxjJy216Q6aYYT68PEx9JU=";
|
||||
pname = "BoltzTraP2";
|
||||
inherit version;
|
||||
hash = "sha256-lGwKHWAslCmb9bVQELHD6kAay+dnieiNsSAfAyNFLPM=";
|
||||
};
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
nativeBuildInputs = [ cmake cython ];
|
||||
checkInputs = [ pytest ];
|
||||
propagatedBuildInputs = [ spglib numpy scipy matplotlib ase netcdf4 ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
cython
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
spglib
|
||||
numpy
|
||||
scipy
|
||||
matplotlib
|
||||
ase
|
||||
netcdf4
|
||||
];
|
||||
|
||||
# pypi release does no include files for tests
|
||||
doCheck = false;
|
||||
|
||||
checkPhase = ''
|
||||
py.test
|
||||
'';
|
||||
pythonImportsCheck = [
|
||||
"BoltzTraP2"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.boltztrap.org/";
|
||||
description = "Band-structure interpolator and transport coefficient calculator";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
homepage = "http://www.boltztrap.org/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "boschshcpy";
|
||||
version = "0.2.30";
|
||||
version = "0.2.31";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "tschamm";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-qq01hnNiJ6BUGhi5owYvxM+Kj7/KYp0vBpILmwPuZaw=";
|
||||
sha256 = "sha256-04qTjwnPckBHKBs9+BFWtTJ9uVc0U1oJAiLIE1nqQdE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -2,45 +2,48 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, bitbox02
|
||||
, cbor
|
||||
, ecdsa
|
||||
, hidapi
|
||||
, libusb1
|
||||
, mnemonic
|
||||
, pyaes
|
||||
, pyserial
|
||||
, typing-extensions
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hwi";
|
||||
version = "2.0.2";
|
||||
version = "2.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitcoin-core";
|
||||
repo = "HWI";
|
||||
rev = version;
|
||||
sha256 = "sha256-s0pKYqesZjHE6YndqsMwCuqLK7eE82oRiSXxBdUtEX4=";
|
||||
sha256 = "sha256-ih4k58OdH5taf/7fvqLeWLrMzR38uPpDSGE4KU8sEAk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bitbox02
|
||||
cbor
|
||||
ecdsa
|
||||
hidapi
|
||||
libusb1
|
||||
mnemonic
|
||||
pyaes
|
||||
pyserial
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
# make compatible with libusb1 2.x
|
||||
# relax required dependencies:
|
||||
# libusb1 - https://github.com/bitcoin-core/HWI/issues/579
|
||||
# typing-extensions - https://github.com/bitcoin-core/HWI/issues/572
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'libusb1>=1.7,<2.0' 'libusb1>=1.7' \
|
||||
--replace "'python_requires': '>=3.6,<3.10'," "'python_requires': '>=3.6,<4'," \
|
||||
--replace 'typing-extensions>=3.7,<4.0' 'typing-extensions>=3.7'
|
||||
--replace 'libusb1>=1.7,<3' 'libusb1>=1.7,<4' \
|
||||
--replace 'typing-extensions>=3.7,<4.0' 'typing-extensions>=3.7,<5.0'
|
||||
'';
|
||||
|
||||
# tests require to clone quite a few firmwares
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
, wrapQtAppsHook
|
||||
}: mkDerivationWith buildPythonPackage rec {
|
||||
pname = "napari";
|
||||
version = "0.4.14";
|
||||
version = "0.4.15";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
@ -36,7 +36,7 @@
|
|||
owner = "napari";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uDDj5dzsT4tRVV0Y+CYegiCpLM77XFaXEXEZXTnX808=";
|
||||
sha256 = "sha256-52TDMU6box7TA26P0F9ZgPr8fyzYM646lPUfOektOuE=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
@ -2,12 +2,13 @@
|
|||
, lib
|
||||
, buildPythonPackage
|
||||
, git
|
||||
, which
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nix-prefetch-github";
|
||||
version = "5.0.1";
|
||||
version = "5.1.2";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
@ -15,10 +16,10 @@ buildPythonPackage rec {
|
|||
owner = "seppeljordan";
|
||||
repo = "nix-prefetch-github";
|
||||
rev = "v${version}";
|
||||
sha256 = "DOmFfUCLJ+rnS4PznQaQrDrqjUU4DXmOrC9BspqKZVM=";
|
||||
sha256 = "GHUH3Oog800qrdgXs5AEa4O6ovZ1LT0k3P4YwEHfwlY=";
|
||||
};
|
||||
|
||||
checkInputs = [ git ];
|
||||
checkInputs = [ git which ];
|
||||
|
||||
checkPhase = ''
|
||||
python -m unittest discover
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pubnub";
|
||||
version = "6.2.0";
|
||||
version = "6.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -21,8 +21,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "python";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QOOPcWhhEqg7c0INQv88+eOP0povN8W4lLoaly9TGu0=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-HnDCRwGrWYVW2WpCFDySVYzNW4/cNhVqNG2YfF5V3WY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyezviz";
|
||||
version = "0.2.0.6";
|
||||
version = "0.2.0.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "baqs";
|
||||
repo = "pyEzviz";
|
||||
rev = version;
|
||||
sha256 = "sha256-3GRyM6OK0EpQ7wepTzqg+XANx9D0OVBTnw98i3b1V/8=";
|
||||
sha256 = "sha256-cQsjEH+e2/rNXmCnhNRv2Vg5i/ax0x88w1pit2eVO2c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -6,25 +6,25 @@
|
|||
, jinja2
|
||||
, ipython
|
||||
, jsonpickle
|
||||
, numpy }:
|
||||
, numpy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvis";
|
||||
version = "unstable-2021-04-29";
|
||||
version = "0.2.1";
|
||||
|
||||
# We use unstable, as test are failing for 0.1.9
|
||||
src = fetchFromGitHub {
|
||||
owner = "WestHealth";
|
||||
repo = pname;
|
||||
rev = "4c521302abf9725dcbe7f59962baf85360b2718d";
|
||||
sha256 = "sha256-DYbHQpxtSfiLbzmBGclym/ChM0WLBzSEC/3phDTtGY8=";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cER5XYxnURzRLtrisWBu2kxtOiRqgaRTJYyaCMh2qqE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove when https://github.com/WestHealth/pyvis/pull/101 is merged.
|
||||
# Fix test: https://github.com/WestHealth/pyvis/issues/138
|
||||
(fetchpatch {
|
||||
url = "https://github.com/WestHealth/pyvis/commit/158a34de45f970b17ffd746c6e705b89128e2445.patch";
|
||||
sha256 = "sha256-zK72nrnn5YLGNW6PKYUyHry5ORCdt1T1oH6n1X64DKg=";
|
||||
url = "https://github.com/WestHealth/pyvis/commit/eaa24b882401e2e74353efa78bf4e71a880cfc47.patch";
|
||||
sha256 = "sha256-hyDypavoCM36SiuQda1U4FLUPdAjTIMtaeZ0KqfHKzI=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dsq";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "multiprocessio";
|
||||
repo = "dsq";
|
||||
rev = version;
|
||||
hash = "sha256-6Rdw/bXIcIoQ/PsVtJKSlwIhCxSlISPmmb2lGbp8vVM=";
|
||||
hash = "sha256-BhWcl0yMpTi/6+dFk6wX/rMkH1k9m9eVm40iNwZGrJM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-hZeI1XqW1lk9F66TVirkpvCZrJb9MO8aS1Sx/R92ddc=";
|
||||
vendorSha256 = "sha256-mSF2oNdTKAg3iRejKkn24hSCJDM6iOkRMruic73ceX4=";
|
||||
|
||||
nativeBuildInputs = [ diffutils ];
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "spire";
|
||||
version = "1.2.1";
|
||||
version = "1.2.3";
|
||||
|
||||
outputs = [ "out" "agent" "server" ];
|
||||
|
||||
|
@ -10,10 +10,10 @@ buildGoModule rec {
|
|||
owner = "spiffe";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LK73RGSTwGhCXOglsqK8RAAldovRzliE78vi2ilTSrw=";
|
||||
sha256 = "sha256-k2kg1Wz0pPV9di2T1A1QvPxLqS5uZBvklNfBW72dQa0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-am8ZTUX8Vph1Eg013NObMiSVeupS2hlHdpZ/1mO27dY=";
|
||||
vendorSha256 = "sha256-J2D5hD0+0VY0sWi6O/McLIvK775aQiDqA+h24oYgRxY=";
|
||||
|
||||
subPackages = [ "cmd/spire-agent" "cmd/spire-server" ];
|
||||
|
||||
|
|
Loading…
Reference in a new issue