git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commitcc35c7fc8535edb8692890b5769cb4ade95cccfb authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> dateSat 22 May 2021, 06:21 (5 years ago) parent7507aedb9b3420
11 files changed+138−23
pkgs/applications/science/logic/poly/default.nix+7 pkgs/applications/version-management/git-and-tools/gh/default.nix+3−3 pkgs/development/python-modules/bacpypes/default.nix+4−3 pkgs/development/python-modules/elementpath/default.nix+2−2 pkgs/development/python-modules/pydicom/default.nix+3 pkgs/development/python-modules/pyside/shiboken.nix+13−5 pkgs/development/python-modules/pyvisa-py/default.nix+48 pkgs/development/python-modules/pyvisa/default.nix+49 pkgs/development/python-modules/xmlschema/default.nix+2−7 pkgs/tools/games/ajour/default.nix+3−3 pkgs/top-level/python-packages.nix+4
pkgs/applications/science/logic/poly/default.nix+7
@@ -12,6 +12,13 @@ stdenv.mkDerivation rec {
1212 sha256 = "sha256-E2lHo8Bt4ujoGQ623fjkQbqRnDYJYilXdRt4lnF4wJk=";
1313 };
1414
15+ # https://github.com/SRI-CSL/libpoly/pull/52
16+ postPatch = lib.optionalString stdenv.isDarwin ''
17+ substituteInPlace src/CMakeLists.txt --replace \
18+ '"utils/open_memstream.c ''${poly_SOURCES}"' \
19+ 'utils/open_memstream.c ''${poly_SOURCES}'
20+ '';
21+
1522 nativeBuildInputs = [ cmake ];
1623
1724 buildInputs = [ gmp python3 ];
pkgs/applications/version-management/git-and-tools/gh/default.nix+3−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "gh";
5− version = "1.10.2";
5+ version = "1.10.3";
66
77 src = fetchFromGitHub {
88 owner = "cli";
99 repo = "cli";
1010 rev = "v${version}";
11− sha256 = "sha256-hI4kV7Xj0oMEfD6SzZ+KWHmMp9yGtr18HPPwkOpr5JA=";
11+ sha256 = "sha256-hwqnINygXycd9W6tPjXsRcGbdTyULGL31aRl5NUxGtc=";
1212 };
1313
14− vendorSha256 = "sha256-A7Bo0HQ5Z2SXY32jWCYgwvvInD3xYLSXvipzeaQTDiM=";
14+ vendorSha256 = "sha256-acFN/StOMu8RSN/wvJsf4vSnjsmRnkrjuDb9cDMnXRs=";
1515
1616 nativeBuildInputs = [ installShellFiles ];
1717
pkgs/development/python-modules/bacpypes/default.nix+4−3
@@ -1,15 +1,16 @@
11{ lib, buildPythonPackage, fetchPypi, fetchFromGitHub
2−, wheel, pytestCheckHook, pytestrunner }:
2+, wheel, pytestCheckHook, pytestrunner, pythonAtLeast }:
33
44buildPythonPackage rec {
5− version = "0.18.1";
5+ version = "0.18.4";
66 pname = "bacpypes";
7+ disabled = pythonAtLeast "3.9";
78
89 src = fetchFromGitHub {
910 owner = "JoelBender";
1011 repo = "bacpypes";
1112 rev = version;
12− sha256 = "1fxrh57z3fjl95db8jh71grkv5id8qk65g6k5jqcs9v3dgkg8jkl";
13+ sha256 = "1z5v0i7ms8na062wxd5ki43yy5z2d9cns0p4vdmkx2drwsbzlav2";
1314 };
1415
1516 propagatedBuildInputs = [ wheel ];
pkgs/development/python-modules/elementpath/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, buildPythonPackage, fetchFromGitHub, isPy27 }:
22
33buildPythonPackage rec {
4− version = "2.2.1";
4+ version = "2.2.2";
55 pname = "elementpath";
66 disabled = isPy27; # uses incompatible class syntax
77
@@ -9,7 +9,7 @@ buildPythonPackage rec {
99 owner = "sissaschool";
1010 repo = "elementpath";
1111 rev = "v${version}";
12− sha256 = "15yjl18n81zddd27789mcy12gnja3cqycjdykybwgd9i0ysj96gl";
12+ sha256 = "sha256-n4zIn2WmFHaVaah2J0mz7Q6G4Ptb8Ms0dwQYbh0Ofcs=";
1313 };
1414
1515 # avoid circular dependency with xmlschema which directly depends on this
pkgs/development/python-modules/pydicom/default.nix+3
@@ -53,6 +53,9 @@ buildPythonPackage {
5353 ] ++ lib.optionals stdenv.isAarch64 [
5454 # https://github.com/pydicom/pydicom/issues/1386
5555 "test_array"
56+ ] ++ lib.optionals stdenv.isDarwin [
57+ # flaky, hard to reproduce failure outside hydra
58+ "test_time_check"
5659 ];
5760
5861 meta = with lib; {
pkgs/development/python-modules/pyside/shiboken.nix+13−5
@@ -1,8 +1,6 @@
11{ lib, fetchFromGitHub, buildPythonPackage
22, cmake
3−, isPy35
4−, isPy36
5−, isPy37
3+, fetchurl
64, isPy3k
75, libxml2
86, libxslt
@@ -10,6 +8,7 @@
108, pysideApiextractor
119, pysideGeneratorrunner
1210, python
11+, pythonAtLeast
1312, qt4
1413, sphinx
1514}:
@@ -39,8 +38,17 @@ buildPythonPackage rec {
3938 \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/
4039 '';
4140
42− # gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86
43− patches = [ ./gcc6.patch ] ++ (lib.optional (isPy35 || isPy36 || isPy37) ./shiboken_py35.patch);
41+ patches = [
42+ # gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86
43+ ./gcc6.patch
44+ (lib.optional (pythonAtLeast "3.5") ./shiboken_py35.patch)
45+ (fetchurl {
46+ # https://github.com/pyside/Shiboken/pull/90
47+ name = "fix-build-with-python-3.9.patch";
48+ url = "https://github.com/pyside/Shiboken/commit/d1c901d4c0af581003553865360ba964cda041e8.patch";
49+ sha256 = "1f7slz8n8rps5r67hz3hi4rr82igc3l166shfy6647ivsb2fnxwy";
50+ })
51+ ];
4452
4553 cmakeFlags = lib.optionals isPy3k [
4654 "-DUSE_PYTHON3=TRUE"
pkgs/development/python-modules/pyvisa-py/default.nixnew file+48
@@ -0,0 +1,48 @@
1+{ lib
2+, fetchFromGitHub
3+, buildPythonPackage
4+, setuptools-scm
5+, pyserial
6+, pyusb
7+, pyvisa
8+, typing-extensions
9+, pytestCheckHook
10+}:
11+
12+buildPythonPackage rec {
13+ pname = "pyvisa-py";
14+ version = "0.5.1";
15+
16+ src = fetchFromGitHub {
17+ owner = "pyvisa";
18+ repo = "pyvisa-py";
19+ rev = version;
20+ hash = "sha256-V1BS+BvHVI8h/rynLnOHvQdIR6RwQrNa2p2S6GQug98=";
21+ };
22+
23+ nativeBuildInputs = [
24+ setuptools-scm
25+ ];
26+
27+ propagatedBuildInputs = [
28+ pyserial
29+ pyusb
30+ pyvisa
31+ typing-extensions
32+ ];
33+
34+ checkInputs = [
35+ pytestCheckHook
36+ ];
37+
38+ postConfigure = ''
39+ export SETUPTOOLS_SCM_PRETEND_VERSION="v${version}"
40+ '';
41+
42+ meta = with lib; {
43+ description = "PyVISA backend that implements a large part of the Virtual Instrument Software Architecture in pure Python";
44+ homepage = "https://github.com/pyvisa/pyvisa-py";
45+ license = licenses.mit;
46+ maintainers = with maintainers; [ mvnetbiz ];
47+ };
48+}
pkgs/development/python-modules/pyvisa/default.nixnew file+49
@@ -0,0 +1,49 @@
1+{ lib
2+, fetchFromGitHub
3+, buildPythonPackage
4+, setuptools-scm
5+, setuptools
6+, typing-extensions
7+, pytestCheckHook
8+}:
9+
10+buildPythonPackage rec {
11+ pname = "pyvisa";
12+ version = "1.11.3";
13+
14+ src = fetchFromGitHub {
15+ owner = "pyvisa";
16+ repo = "pyvisa";
17+ rev = version;
18+ hash = "sha256-Qe7W1zPI1aedLDnhkLTDPTa/lsNnCGik5Hu+jLn+meA=";
19+ };
20+
21+ nativeBuildInputs = [
22+ setuptools-scm
23+ ];
24+
25+ propagatedBuildInputs = [
26+ typing-extensions
27+ setuptools
28+ ];
29+
30+ checkInputs = [
31+ pytestCheckHook
32+ ];
33+
34+ # Test can't find cli tool bin path correctly
35+ disabledTests = [
36+ "test_visa_info"
37+ ];
38+
39+ postConfigure = ''
40+ export SETUPTOOLS_SCM_PRETEND_VERSION="v${version}"
41+ '';
42+
43+ meta = with lib; {
44+ description = "Python package for support of the Virtual Instrument Software Architecture (VISA)";
45+ homepage = "https://github.com/pyvisa/pyvisa";
46+ license = licenses.mit;
47+ maintainers = with maintainers; [ mvnetbiz ];
48+ };
49+}
pkgs/development/python-modules/xmlschema/default.nix+2−7
@@ -5,25 +5,20 @@
55}:
66
77buildPythonPackage rec {
8− version = "1.5.3";
8+ version = "1.6.2";
99 pname = "xmlschema";
1010
1111 src = fetchFromGitHub {
1212 owner = "sissaschool";
1313 repo = "xmlschema";
1414 rev = "v${version}";
15− sha256 = "0pv8zdz03wjnjwrgjr5pc3q69h7zh51h0iwgwxwl65qi1r6ydk54";
15+ sha256 = "sha256-GL2PlHxKDSEsZwHPBAy+tjBSbKyvlbXUWwXakKPmzSs=";
1616 };
1717
1818 propagatedBuildInputs = [ elementpath ];
1919
2020 checkInputs = [ lxml pytest ];
2121
22− postPatch = ''
23− substituteInPlace setup.py \
24− --replace "elementpath~=2.0.0" "elementpath~=2.0"
25− '';
26−
2722 # Ignore broken fixtures, and tests for files which don't exist.
2823 # For darwin, we need to explicity say we can't reach network
2924 checkPhase = ''
pkgs/tools/games/ajour/default.nix+3−3
@@ -34,16 +34,16 @@ let
3434
3535in rustPlatform.buildRustPackage rec {
3636 pname = "Ajour";
37− version = "1.1.0";
37+ version = "1.2.0";
3838
3939 src = fetchFromGitHub {
4040 owner = "casperstorm";
4141 repo = "ajour";
4242 rev = version;
43− sha256 = "1xzsgxkdwdqcr8xs9ajr1ykfjjz95z9k7b7l644yijg31xf1lbq6";
43+ sha256 = "0xmjr8brjmkk13dsn3yvcl5ss6b214hpka0idk072n46qsyhg2wh";
4444 };
4545
46− cargoSha256 = "02g25wr0f2bjr7zmpll3iicc6i8wk1j9iavagg1vhbpynp6z013x";
46+ cargoSha256 = "06d1h2c2abg56567znxh65d4ddpi6wvxip9rbzkmdnzgy3b3y2wl";
4747
4848 nativeBuildInputs = [
4949 autoPatchelfHook
pkgs/top-level/python-packages.nix+4
@@ -6927,6 +6927,10 @@ in {
69276927
69286928 pyvicare = callPackage ../development/python-modules/pyvicare { };
69296929
6930+ pyvisa = callPackage ../development/python-modules/pyvisa { };
6931+
6932+ pyvisa-py = callPackage ../development/python-modules/pyvisa-py { };
6933+
69306934 pyviz-comms = callPackage ../development/python-modules/pyviz-comms { };
69316935
69326936 pyvizio = callPackage ../development/python-modules/pyvizio { };