diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-14 12:01:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-14 12:01:23 +0000 |
commit | bc35dc4f3b708b17389286795c227bd6716cbcd5 (patch) | |
tree | fcad7cc1f371300218d36872f92ead3c3b6c4cfa | |
parent | 30e1b0bd69e43bb9ad9fba81c3ecbb4fd5d5be21 (diff) | |
parent | 161f6ec9a50413f61cc626f5dc5118854dafe6fa (diff) | |
download | nixpkgs-bc35dc4f3b708b17389286795c227bd6716cbcd5.tar nixpkgs-bc35dc4f3b708b17389286795c227bd6716cbcd5.tar.gz nixpkgs-bc35dc4f3b708b17389286795c227bd6716cbcd5.tar.bz2 nixpkgs-bc35dc4f3b708b17389286795c227bd6716cbcd5.tar.lz nixpkgs-bc35dc4f3b708b17389286795c227bd6716cbcd5.tar.xz nixpkgs-bc35dc4f3b708b17389286795c227bd6716cbcd5.tar.zst nixpkgs-bc35dc4f3b708b17389286795c227bd6716cbcd5.zip |
Merge master into staging-next
51 files changed, 632 insertions, 165 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 883d4edfeca..4dbc5909a8f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9654,6 +9654,16 @@ githubId = 500703; name = "Tadas Barzdžius"; }; + revol-xut = { + email = "revol-xut@protonmail.com"; + name = "Tassilo Tanneberger"; + github = "revol-xut"; + githubId = 32239737; + keys = [{ + longkeyid = "rsa4096/B966009D57E69CC6"; + fingerprint = "91EB E870 1639 1323 642A 6803 B966 009D 57E6 9CC6"; + }]; + }; rexim = { email = "reximkut@gmail.com"; github = "rexim"; @@ -13156,4 +13166,10 @@ github = "zupo"; githubId = 311580; }; + sei40kr = { + name = "Seong Yong-ju"; + email = "sei40kr@gmail.com"; + github = "sei40kr"; + githubId = 11665236; + }; } diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index c88ac932e4f..29c0dce205d 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4810"; + version = "4813"; src = fetchurl { url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz"; - sha256 = "j21WTEu+MTmnFrRH5B8Eb1tS2elFR715R8jhgKZ5Gmw="; + sha256 = "Zx3j3ITsL3eOMVYxKLnfzwPMkr+BQ+soK+zhzYbnnak="; }; patches = [ diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index 1bd8b589924..1684003fb76 100644 --- a/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "splitter"; - version = "642"; + version = "643"; src = fetchurl { url = "https://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz"; - sha256 = "zMuMutkk0RsbEH+5undcMmZRCGYJ7LRvdK1pxAgQRYk="; + sha256 = "gyMCQAKnP4FDcHEgJiiftKhBEG9N92etpwKBnmIbzhU="; }; patches = [ diff --git a/pkgs/applications/misc/nwg-wrapper/default.nix b/pkgs/applications/misc/nwg-wrapper/default.nix index 043ea23e3a7..770227186ff 100644 --- a/pkgs/applications/misc/nwg-wrapper/default.nix +++ b/pkgs/applications/misc/nwg-wrapper/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "nwg-wrapper"; - version = "0.0.2"; + version = "0.1.0"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LkAB0MrwQxP3X7glfSnI0GZMv8tjaeSOz7WSOW33wuo="; + sha256 = "0xkxyfbj8zljx7k5wbniz3x9jg0l4jnbbjv8hy5y5p4l10m0vpjs"; }; nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/applications/networking/cluster/kn/default.nix index a41c3c0ad35..411efb6e527 100644 --- a/pkgs/applications/networking/cluster/kn/default.nix +++ b/pkgs/applications/networking/cluster/kn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kn"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "knative"; repo = "client"; rev = "v${version}"; - sha256 = "sha256-hquxv1BluR535WvMtJlVyP7JuARDNGDjPAbdSSj2juo="; + sha256 = "sha256-nuSx+JKXBgkVwuy6RMZc8pxDv5WjXN3+5pIudazTttc="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index fae4eff734e..b8ee5182c26 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -40,43 +40,15 @@ assert builtins.elem (lib.toLower chatType) [ assert enablePsiMedia -> enablePlugins; -mkDerivation { +mkDerivation rec { pname = "psi-plus"; - - # Version mask is “X.X.XXXX-R” where “X.X.XXXX” is a mandatory version of Psi - # and “-R” ending is optional revision number. - # - # The “psi-plus-snapshots” generally provides snapshots of these separate - # repositories glued together (there are also dependencies/libraries): - # - # 1. Psi - # 2. Plugins pack for Psi - # 3. “psimedia” plugin - # 4. Resources for Psi (icons, skins, sounds) - # - # “X.X.XXXX” is literally a version of Psi. - # So often when for instance plugins are updated separately a new snapshot is - # created. And that snapshot would also be linked to “X.X.XXXX” version. - # So many commits may have the same associated version of the snapshot. - # But mind that only one Git tag is created for “X.X.XXXX” version. - # - # It’s not yet defined in the Psi+ project what value to use as a version for - # any further releases that don’t change Psi version. - # - # Let’s do what Debian does for instance (appends “-R” where “R” is a revision - # number). - # E.g. https://tracker.debian.org/news/1226321/psi-plus-14554-5-migrated-to-testing/ - # - # This has been communicated with the Psi+ main devs in this XMPP MUC chat: - # psi-dev@conference.jabber.ru - # - version = "1.5.1556-2"; + version = "1.5.1576"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; - rev = "635879010b6697f7041a7bbea1853a1f4673c7f7"; - sha256 = "18xvljcm0a9swkyz4diwxi4xaj0w27jnhfgpi8fv5fj11j0g1b3a"; + rev = version; + sha256 = "15iqa8hd4p968sp79zsi32g7bhamgg267pk2bxspl646viv91f6g"; }; cmakeFlags = [ diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 85a07254771..31f478c47c0 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -21,16 +21,14 @@ , curl , wayland , xorg -, makeWrapper , pkg-config , libvlc , mbedtls - +, wrapGAppsHook , scriptingSupport ? true , luajit , swig , python3 - , alsaSupport ? stdenv.isLinux , alsa-lib , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux @@ -68,7 +66,7 @@ mkDerivation rec { addOpenGLRunpath cmake pkg-config - makeWrapper + wrapGAppsHook ] ++ optional scriptingSupport swig; @@ -121,9 +119,13 @@ mkDerivation rec { "-DCEF_ROOT_DIR=../../cef" ]; - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 libvlc ]}" - ]; + dontWrapGApps = true; + preFixup = '' + qtWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xorg.libX11 libvlc ]}" + ''${gappsWrapperArgs[@]} + ) + ''; postFixup = lib.optionalString stdenv.isLinux '' addOpenGLRunpath $out/lib/lib*.so diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index c8c2853203c..89b6b1e384c 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "41.0"; + version = "41.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0gqrxcn7fcvlh5c9691lx5zgdgs71ah15h5psrbhkg8qcqy95b3k"; + sha256 = "m1EmsjPhuPic9MIyYIlXHYKakwPsieplz2IWTmp0IuE="; }; patches = [ diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix index cea9ea37b4e..2e6b0d3f68f 100644 --- a/pkgs/development/compilers/dev86/default.nix +++ b/pkgs/development/compilers/dev86/default.nix @@ -13,9 +13,17 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; + # Parallel builds are not supported due to build process structure: + # tools are built sequentially in submakefiles and are reusing the + # same targets as dependencies. Building dependencies in parallel + # from different submakes is not synchronized and fails: + # make[3]: Entering directory '/build/dev86-0.16.21/libc' + # Unable to execute as86. + enableParallelBuilding = false; + meta = { description = "Linux 8086 development environment"; - homepage = "http://v3.sk/~lkundrak/dev86/"; + homepage = "https://github.com/lkundrak/dev86"; platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/lingua-franca/default.nix b/pkgs/development/compilers/lingua-franca/default.nix new file mode 100644 index 00000000000..b843fd5e850 --- /dev/null +++ b/pkgs/development/compilers/lingua-franca/default.nix @@ -0,0 +1,41 @@ +{ lib, pkgs, stdenv, fetchFromGitHub, jdk11_headless }: + +stdenv.mkDerivation { + pname = "lfc"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "revol-xut"; + repo = "lingua-franca-nix-releases"; + rev = "11c6d5297cd63bf0b365a68c5ca31ec80083bd05"; + sha256 = "DgxunzC8Ep0WdwChDHWgG5QJbJZ8UgQRXtP1HZqL9Jg="; + }; + + buildInputs = [ jdk11_headless ]; + + _JAVA_HOME = "${jdk11_headless}/"; + + postPatch = '' + substituteInPlace bin/lfc \ + --replace 'base=`dirname $(dirname ''${abs_path})`' "base='$out'" \ + --replace "run_lfc_with_args" "${jdk11_headless}/bin/java -jar $out/lib/jars/org.lflang.lfc-0.1.0-SNAPSHOT-all.jar" + ''; + + installPhase = '' + cp -r ./ $out/ + chmod +x $out/bin/lfc + ''; + + meta = with lib; { + description = "Polyglot coordination language"; + longDescription = '' + Lingua Franca (LF) is a polyglot coordination language for concurrent + and possibly time-sensitive applications ranging from low-level + embedded code to distributed cloud and edge applications. + ''; + homepage = "https://github.com/lf-lang/lingua-franca"; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ revol-xut ]; + }; +} diff --git a/pkgs/development/libraries/boxfort/default.nix b/pkgs/development/libraries/boxfort/default.nix index 93176fb230f..ab2805a15e7 100644 --- a/pkgs/development/libraries/boxfort/default.nix +++ b/pkgs/development/libraries/boxfort/default.nix @@ -29,5 +29,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ thesola10 Yumasi ]; platforms = platforms.unix; + # Upstream currently broken for macOS https://cirrus-ci.com/build/5624937369042944 + broken = stdenv.targetPlatform.isDarwin; }; } diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix index d4998b51592..2c19c4ae7d0 100644 --- a/pkgs/development/libraries/hiredis/default.nix +++ b/pkgs/development/libraries/hiredis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hiredis"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "redis"; repo = "hiredis"; rev = "v${version}"; - sha256 = "01xnynm9d56a0alb5wxbfayakybm5pnr12icj9mqkn4xxihbnbgr"; + sha256 = "0a55zk3qrw9yl27i87h3brg2hskmmzbfda77dhq9a4if7y70xnfb"; }; PREFIX = "\${out}"; diff --git a/pkgs/development/libraries/ogre/1.10.x.nix b/pkgs/development/libraries/ogre/1.10.x.nix index 849db216b92..61679278781 100644 --- a/pkgs/development/libraries/ogre/1.10.x.nix +++ b/pkgs/development/libraries/ogre/1.10.x.nix @@ -16,6 +16,14 @@ stdenv.mkDerivation { sha256 = "1zwvlx5dz9nwjazhnrhzb0w8ilpa84r0hrxrmmy69pgr1p1yif5a"; }; + # fix for ARM. sys/sysctl.h has moved in later glibcs, and + # https://github.com/OGRECave/ogre-next/issues/132 suggests it isn't + # needed anyway. + postPatch = '' + substituteInPlace OgreMain/src/OgrePlatformInformation.cpp \ + --replace '#include <sys/sysctl.h>' "" + ''; + cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix index 30d1dd18554..7548ed48e7a 100644 --- a/pkgs/development/libraries/ogre/1.9.x.nix +++ b/pkgs/development/libraries/ogre/1.9.x.nix @@ -19,6 +19,14 @@ stdenv.mkDerivation rec { sha256 = "11lfgzqaps3728dswrq3cbwk7aicigyz08q4hfyy6ikc6m35r4wg"; }; + # fix for ARM. sys/sysctl.h has moved in later glibcs, and + # https://github.com/OGRECave/ogre-next/issues/132 suggests it isn't + # needed anyway. + postPatch = '' + substituteInPlace OgreMain/src/OgrePlatformInformation.cpp \ + --replace '#include <sys/sysctl.h>' "" + ''; + cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index e5e6f5f7ce7..e93dfdfb144 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -40,6 +40,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-FHW0+DZhw6MLlhjh4DRYhA+6vBBXMN9K6GEVoR6P5kM="; }; + # fix for ARM. sys/sysctl.h has moved in later glibcs, and + # https://github.com/OGRECave/ogre-next/issues/132 suggests it isn't + # needed anyway. + postPatch = '' + substituteInPlace OgreMain/src/OgrePlatformInformation.cpp \ + --replace '#include <sys/sysctl.h>' "" + ''; + cmakeFlags = [ "-DOGRE_BUILD_DEPENDENCIES=OFF" "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix index 7b97febc6ec..70e3923ee72 100644 --- a/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "aiohttp_remotes"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1vv2ancxsaxlls9sinigjnrqyx95n7cphq37m8nwifkhvs0idv6a"; + sha256 = "e44f2c5fd5fc3305477c89bb25f14570589100cc58c48b36745d4239839d3174"; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index b93ba47c72a..a99be4038b3 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.8.1"; + version = "1.9.0"; # No tests available in PyPI tarball src = fetchFromGitHub { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "v${version}"; - sha256 = "1avq04hmps2cd33dd5n4bc3lclqg0hv6khn804fbv0hmy7lywp8b"; + sha256 = "1ff1hr282snpjs5ggf7agxk5y6nr4xjdahmzq6hv56gj4lcfsq7c"; }; # Package is not compatible with Python 3.5 diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index fbdd15522e6..e3125343dff 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.12.5"; + version = "0.12.6"; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8bb80b37ebfd01f6078c60bb3231118380ac06842de692f6e37b6f8643e15a1d"; + sha256 = "65d71b4cd78165bea962dfbda361b47b9b5a6198d8074046b8667da9653d0752"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/azure-appconfiguration/default.nix b/pkgs/development/python-modules/azure-appconfiguration/default.nix index d0a4c2b19d7..ee7f9fd44ff 100644 --- a/pkgs/development/python-modules/azure-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-appconfiguration/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "azure-appconfiguration"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "85c9c25612f160897ae212532ec7c19c94b0f4463f4830d0ee08cb2d296df407"; + sha256 = "9372467c74930d20827135d468b7fcaa1ad42e4673a4591ceadbb6ad8e1b7e07"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index d0a05c03f11..2013bc64545 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.7.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3faaecb645e3b2300648a4a452458ec0e31e13d9dc928e710992e43ef4694205"; + sha256 = "7f22cd0c7a9b92ed297dd67ae79d9bb9a866e404061c02cec709ad10c4c88e19"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-loganalytics/default.nix b/pkgs/development/python-modules/azure-loganalytics/default.nix index aa3d9c8ab0f..ee3f0460fd7 100644 --- a/pkgs/development/python-modules/azure-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-loganalytics/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "0.1.0"; + version = "0.1.1"; pname = "azure-loganalytics"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3ceb350def677a351f34b0a0d1637df6be0c6fe87ff32a5270b17f540f6da06e"; + sha256 = "68ffb9a2206e06b9672100a8e6351cc04f75bb81867f30d416c68b55d624d793"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix index c3ba311d4c4..2023eb0ab56 100644 --- a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-eventgrid"; - version = "9.0.0"; + version = "10.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "aecbb69ecb010126c03668ca7c9a2be8e965568f5b560f0e7b5bc152b157b510"; + sha256 = "582e314ca05a9be0cd391c64689e6a5332d5bbad76c2ea751b727cfe99a2a3d2"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 56d1caa7eaf..e3fc2424bcd 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,20 +6,25 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.36"; + version = "8.12.37"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "e29717fcf86d68082fc6e42ca07e52bff863b6e0b354edd1644ba15c35ef213d"; + sha256 = "sha256-28VgmShEoFn1bHwMalh5BOZdlWdAu/t+OViZgLyQVbg="; }; checkInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/*.py" ]; + pytestFlagsArray = [ + "tests/*.py" + ]; - pythonImportsCheck = [ "phonenumbers" ]; + pythonImportsCheck = [ + "phonenumbers" + ]; meta = with lib; { description = "Python module for handling international phone numbers"; diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index 141eba29f31..a550ea4b3cf 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -8,6 +8,7 @@ , catch2 , cmake , cython +, fmt , muparserx , ninja , nlohmann_json @@ -23,11 +24,13 @@ , fixtures , pytest-timeout , qiskit-terra +, setuptools +, testtools }: buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.8.2"; + version = "0.9.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -36,23 +39,16 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aer"; rev = version; - hash = "sha256-7NWM7qpMQ3vA6p0dhEPnkBjsPMdhceYTYcAD4tsClf0="; + sha256 = "sha256-SAJjU2zYz6UabOPV1KI2JB7CbJfUJcjbPKbo6iiCk/g="; }; - patches = [ - (fetchpatch { - # https://github.com/Qiskit/qiskit-aer/pull/1250 - name = "qiskit-aer-pr-1250-native-cmake_dl_libs.patch"; - url = "https://github.com/Qiskit/qiskit-aer/commit/2bf04ade3e5411776817706cf82cc67a3b3866f6.patch"; - sha256 = "0ldwzxxfgaad7ifpci03zfdaj0kqj0p3h94qgshrd2953mf27p6z"; - }) - ]; - # Remove need for cmake python package - # pybind11 shouldn't be an install requirement, just build requirement. postPatch = '' substituteInPlace setup.py \ --replace "'cmake!=3.17,!=3.17.0'," "" \ - --replace "'pybind11>=2.6'" "" + --replace "'pybind11', min_version='2.6'" "'pybind11'" \ + --replace "pybind11>=2.6" "pybind11" \ + --replace "scikit-build>=0.11.0" "scikit-build" \ + --replace "min_version='0.11.0'" "" ''; nativeBuildInputs = [ @@ -65,6 +61,7 @@ buildPythonPackage rec { buildInputs = [ blas catch2 + fmt muparserx nlohmann_json spdlog @@ -76,7 +73,6 @@ buildPythonPackage rec { numpy ]; - # Disable using conan for build preBuild = '' export DISABLE_CONAN=1 ''; @@ -92,6 +88,16 @@ buildPythonPackage rec { ]; # Slow tests disabledTests = [ + "test_snapshot" # TODO: these ~30 tests fail on setup due to pytest fixture issues? + "test_initialize_2" # TODO: simulations appear incorrect, off by >10%. + + # these fail for some builds. Haven't been able to reproduce error locally. + "test_kraus_gate_noise" + "test_backend_method_clifford_circuits_and_kraus_noise" + "test_backend_method_nonclifford_circuit_and_kraus_noise" + "test_kraus_noise_fusion" + + # Slow tests "test_paulis_1_and_2_qubits" "test_3d_oscillator" "_057" @@ -105,6 +111,7 @@ buildPythonPackage rec { "_144" "test_sparse_output_probabilities" "test_reset_2_qubit" + # "test_clifford" ]; checkInputs = [ pytestCheckHook @@ -112,6 +119,8 @@ buildPythonPackage rec { fixtures pytest-timeout qiskit-terra + setuptools # temporary workaround for pbr missing setuptools, see https://github.com/NixOS/nixpkgs/pull/132614 + testtools ]; pytestFlagsArray = [ "--timeout=30" diff --git a/pkgs/development/python-modules/qiskit-aqua/default.nix b/pkgs/development/python-modules/qiskit-aqua/default.nix index 7069629470c..b5bfa729321 100644 --- a/pkgs/development/python-modules/qiskit-aqua/default.nix +++ b/pkgs/development/python-modules/qiskit-aqua/default.nix @@ -19,7 +19,7 @@ , withTorch ? false , pytorch , withPyscf ? false -, pyscf ? null +, pyscf , withScikitQuant ? false , scikit-quant ? null , withCplex ? false @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "qiskit-aqua"; - version = "0.9.1"; + version = "0.9.5"; disabled = pythonOlder "3.6"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aqua"; rev = version; - hash = "sha256-fptyqPrkUgl3UjtlEmDYORdX/SsONxWozQGEs/EahmU="; + sha256 = "sha256-7QmRwlbAVAR5KfM7tuObkb6+UgiuIm82iGWBuqfve08="; }; # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed. @@ -113,13 +113,25 @@ buildPythonPackage rec { pytestFlagsArray = [ "--timeout=30" "--durations=10" - ] ++ lib.optionals (!withPyscf) [ - "--ignore=test/chemistry/test_qeom_ee.py" - "--ignore=test/chemistry/test_qeom_vqe.py" - "--ignore=test/chemistry/test_vqe_uccsd_adapt.py" - "--ignore=test/chemistry/test_bopes_sampler.py" + ]; + disabledTestPaths = lib.optionals (!withPyscf) [ + "test/chemistry/test_qeom_ee.py" + "test/chemistry/test_qeom_vqe.py" + "test/chemistry/test_vqe_uccsd_adapt.py" + "test/chemistry/test_bopes_sampler.py" ]; disabledTests = [ + # TODO: figure out why failing, only fail with upgrade to qiskit-terra > 0.16.1 & qiskit-aer > 0.7.2 + # In test.aqua.test_amplitude_estimation.TestSineIntegral + "test_confidence_intervals_1" + "test_statevector_1" + + # fails due to approximation error with latest qiskit-aer? + "test_application" + + # Fail on CI for some reason, not locally + "test_binary" + # Online tests "test_exchangedata" "test_yahoo" diff --git a/pkgs/development/python-modules/qiskit-finance/default.nix b/pkgs/development/python-modules/qiskit-finance/default.nix new file mode 100644 index 00000000000..d4eaa58e7af --- /dev/null +++ b/pkgs/development/python-modules/qiskit-finance/default.nix @@ -0,0 +1,78 @@ +{ lib +, pythonOlder +, buildPythonPackage +, fetchFromGitHub + # Python Inputs +, fastdtw +, numpy +, pandas +, psutil +, qiskit-terra +, qiskit-optimization +, scikit-learn +, scipy +, quandl +, yfinance + # Check Inputs +, pytestCheckHook +, ddt +, pytest-timeout +, qiskit-aer +}: + +buildPythonPackage rec { + pname = "qiskit-finance"; + version = "0.2.1"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "qiskit"; + repo = pname; + rev = version; + sha256 = "sha256-fEhc/01j6iYYwS6mLle+TpX9j0DVn12oPUFamEecoAY="; + }; + + propagatedBuildInputs = [ + fastdtw + numpy + pandas + psutil + qiskit-terra + qiskit-optimization + quandl + scikit-learn + scipy + yfinance + ]; + + checkInputs = [ + pytestCheckHook + pytest-timeout + ddt + qiskit-aer + ]; + + pythonImportsCheck = [ "qiskit_finance" ]; + disabledTests = [ + # Fail due to approximation error, ~1-2% + "test_application" + + # Tests fail b/c require internet connection. Stalls tests if enabled. + "test_exchangedata" + "test_yahoo" + "test_wikipedia" + ]; + pytestFlagsArray = [ + "--durations=10" + ]; + + meta = with lib; { + description = "Software for developing quantum computing programs"; + homepage = "https://qiskit.org"; + downloadPage = "https://github.com/QISKit/qiskit-optimization/releases"; + changelog = "https://qiskit.org/documentation/release_notes.html"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index aa02de42fb3..88fcb82857d 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -7,9 +7,9 @@ , qiskit-terra , requests , requests_ntlm -, websockets +, websocket-client # Visualization inputs -, withVisualization ? false +, withVisualization ? true , ipython , ipyvuetify , ipywidgets @@ -23,6 +23,7 @@ , nbformat , pproxy , qiskit-aer +, websockets , vcrpy }: @@ -39,7 +40,7 @@ let in buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.13.1"; + version = "0.18.0"; disabled = pythonOlder "3.6"; @@ -47,7 +48,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - hash = "sha256-DlHlXncttzGo4uVoh2aQ7urW6krN3ej2sJ/EwuxeF2I="; + sha256 = "sha256-mVgR9vq9UpM/3VED4hpEev8YAoZY1URAxu7pVv+cjU8="; }; propagatedBuildInputs = [ @@ -56,9 +57,13 @@ buildPythonPackage rec { qiskit-terra requests requests_ntlm - websockets + websocket-client ] ++ lib.optionals withVisualization visualizationPackages; + postPatch = '' + substituteInPlace setup.py --replace "websocket-client>=1.0.1" "websocket-client" + ''; + # Most tests require credentials to run on IBMQ checkInputs = [ pytestCheckHook @@ -67,6 +72,7 @@ buildPythonPackage rec { pproxy qiskit-aer vcrpy + websockets ] ++ lib.optionals (!withVisualization) visualizationPackages; pythonImportsCheck = [ "qiskit.providers.ibmq" ]; @@ -75,6 +81,7 @@ buildPythonPackage rec { "test_old_api_url" "test_non_auth_url" "test_non_auth_url_with_hub" + "test_coder_optimizers" # TODO: reenable when package scikit-quant is packaged, either in NUR or nixpkgs # slow tests "test_websocket_retry_failure" diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix new file mode 100644 index 00000000000..a2006079c19 --- /dev/null +++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix @@ -0,0 +1,87 @@ +{ lib +, pythonOlder +, pythonAtLeast +, buildPythonPackage +, fetchFromGitHub +, fetchpatch + # Python Inputs +, fastdtw +, numpy +, psutil +, qiskit-terra +, scikit-learn +, sparse + # Optional inputs +, withTorch ? true +, pytorch + # Check Inputs +, pytestCheckHook +, ddt +, pytest-timeout +, qiskit-aer +}: + +buildPythonPackage rec { + pname = "qiskit-machine-learning"; + version = "0.2.1"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "qiskit"; + repo = pname; + rev = version; + sha256 = "sha256-2dfrkNZYSaXwiOCaRrPckq4BllANgc6BogyBcP0vosY="; + }; + + propagatedBuildInputs = [ + fastdtw + numpy + psutil + qiskit-terra + scikit-learn + sparse + ] ++ lib.optional withTorch pytorch; + + doCheck = false; # TODO: enable. Tests fail on unstable due to some multithreading issue? + checkInputs = [ + pytestCheckHook + pytest-timeout + ddt + qiskit-aer + ]; + + pythonImportsCheck = [ "qiskit_machine_learning" ]; + + pytestFlagsArray = [ + "--durations=10" + "--showlocals" + "-vv" + "--ignore=test/connectors/test_torch_connector.py" # TODO: fix, get multithreading errors with python3.9, segfaults + ]; + disabledTests = [ + # Slow tests >10 s + "test_readme_sample" + "test_vqr_8" + "test_vqr_7" + "test_qgan_training_cg" + "test_vqc_4" + "test_classifier_with_circuit_qnn_and_cross_entropy_4" + "test_vqr_4" + "test_regressor_with_opflow_qnn_4" + "test_qgan_save_model" + "test_qgan_training_analytic_gradients" + "test_qgan_training_run_algo_numpy" + "test_ad_hoc_data" + "test_qgan_training" + ]; + + meta = with lib; { + description = "Software for developing quantum computing programs"; + homepage = "https://qiskit.org"; + downloadPage = "https://github.com/QISKit/qiskit-optimization/releases"; + changelog = "https://qiskit.org/documentation/release_notes.html"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/qiskit-nature/default.nix b/pkgs/development/python-modules/qiskit-nature/default.nix new file mode 100644 index 00000000000..09941fcdd44 --- /dev/null +++ b/pkgs/development/python-modules/qiskit-nature/default.nix @@ -0,0 +1,80 @@ +{ lib +, pythonOlder +, buildPythonPackage +, fetchFromGitHub + # Python Inputs +, h5py +, numpy +, psutil +, qiskit-terra +, retworkx +, scikit-learn +, scipy +, withPyscf ? false +, pyscf + # Check Inputs +, pytestCheckHook +, ddt +, pylatexenc +}: + +buildPythonPackage rec { + pname = "qiskit-nature"; + version = "0.2.2"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "qiskit"; + repo = pname; + rev = version; + sha256 = "sha256-nQbvH911Gt4KddG23qwmiXfRJTWwVEsrzPvuTQfy4FY="; + }; + + postPatch = '' + substituteInPlace requirements.txt --replace "h5py<3.3" "h5py" + ''; + + propagatedBuildInputs = [ + h5py + numpy + psutil + qiskit-terra + retworkx + scikit-learn + scipy + ] ++ lib.optional withPyscf pyscf; + + checkInputs = [ + pytestCheckHook + ddt + pylatexenc + ]; + + pythonImportsCheck = [ "qiskit_nature" ]; + + pytestFlagsArray = [ + "--durations=10" + ] ++ lib.optionals (!withPyscf) [ + "--ignore=test/algorithms/excited_state_solvers/test_excited_states_eigensolver.py" + ]; + + disabledTests = [ + # small math error < 0.05 (< 9e-6 %) + "test_vqe_uvccsd_factory" + # unsure of failure reason. Might be related to recent cvxpy update? + "test_two_qubit_reduction" + ] ++ lib.optionals (!withPyscf) [ + "test_h2_bopes_sampler" + "test_potential_interface" + ]; + + meta = with lib; { + description = "Software for developing quantum computing programs"; + homepage = "https://qiskit.org"; + downloadPage = "https://github.com/QISKit/qiskit-optimization/releases"; + changelog = "https://qiskit.org/documentation/release_notes.html"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/qiskit-optimization/default.nix b/pkgs/development/python-modules/qiskit-optimization/default.nix new file mode 100644 index 00000000000..5d9ae3d4375 --- /dev/null +++ b/pkgs/development/python-modules/qiskit-optimization/default.nix @@ -0,0 +1,63 @@ +{ lib +, pythonOlder +, buildPythonPackage +, fetchFromGitHub + # Python Inputs +, decorator +, docplex +, networkx +, numpy +, qiskit-terra +, scipy + # Check Inputs +, pytestCheckHook +, ddt +, pylatexenc +, qiskit-aer +}: + +buildPythonPackage rec { + pname = "qiskit-optimization"; + version = "0.2.3"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "qiskit"; + repo = pname; + rev = version; + sha256 = "sha256-y/j/cerzMAKVjehh1LUqYe1Juoa4lIxH2qS165S9img="; + }; + + postPatch = '' + substituteInPlace requirements.txt --replace "networkx>=2.2,<2.6" "networkx" + ''; + + propagatedBuildInputs = [ + docplex + decorator + networkx + numpy + qiskit-terra + scipy + ]; + + checkInputs = [ + pytestCheckHook + ddt + pylatexenc + qiskit-aer + ]; + + pythonImportsCheck = [ "qiskit_optimization" ]; + pytestFlagsArray = [ "--durations=10" ]; + + meta = with lib; { + description = "Software for developing quantum computing programs"; + homepage = "https://qiskit.org"; + downloadPage = "https://github.com/QISKit/qiskit-optimization/releases"; + changelog = "https://qiskit.org/documentation/release_notes.html"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index 8b83c506808..da31f86500f 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -16,7 +16,10 @@ , python-dateutil , retworkx , scipy +, scikit-quant ? null +, symengine , sympy +, tweedledum , withVisualization ? false # Python visualization requirements, optional , ipywidgets @@ -29,9 +32,6 @@ # Crosstalk-adaptive layout pass , withCrosstalkPass ? false , z3 - # Classical function -> Quantum Circuit compiler -, withClassicalFunctionCompiler ? true -, tweedledum # test requirements , ddt , hypothesis @@ -52,12 +52,11 @@ let seaborn ]; crosstalkPackages = [ z3 ]; - classicalCompilerPackages = [ tweedledum ]; in buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.17.4"; + version = "0.18.3"; disabled = pythonOlder "3.6"; @@ -65,7 +64,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - hash = "sha256-JyNuke+XPqjLVZbvPud9Y7k0+EmvETVKcOYcDldBiVo="; + sha256 = "sha256-w/EnkdlC1hvmLqm4I8ajEYADxqMYGdHKrySLcb/yWGs="; }; nativeBuildInputs = [ cython ]; @@ -82,10 +81,12 @@ buildPythonPackage rec { python-dateutil retworkx scipy + scikit-quant + symengine sympy + tweedledum ] ++ lib.optionals withVisualization visualizationPackages - ++ lib.optionals withCrosstalkPass crosstalkPackages - ++ lib.optionals withClassicalFunctionCompiler classicalCompilerPackages; + ++ lib.optionals withCrosstalkPass crosstalkPackages; # *** Tests *** checkInputs = [ @@ -103,21 +104,21 @@ buildPythonPackage rec { disabledTestPaths = [ "test/randomized/test_transpiler_equivalence.py" # collection requires qiskit-aer, which would cause circular dependency - ] ++ lib.optionals (!withClassicalFunctionCompiler) [ - "test/python/classical_function_compiler/" + # These tests are nondeterministic and can randomly fail. + # We ignore them here for deterministic building. + "test/randomized/" + # These tests consistently fail on GitHub Actions build + "test/python/quantum_info/operators/test_random.py" ]; + pytestFlagsArray = [ "--durations=10" ]; disabledTests = [ - # Not working on matplotlib >= 3.4.0, checks images match. - "test_plot_circuit_layout" - # Flaky tests - "test_cx_equivalence" - "test_pulse_limits" - "test_1q_random" - ] ++ lib.optionals (!withClassicalFunctionCompiler) [ - "TestPhaseOracle" - ] ++ lib.optionals stdenv.isAarch64 [ - "test_circuit_init" # failed on aarch64, https://gist.github.com/r-rmcgibbo/c2e173d43ced4f6954811004f6b5b842 + "test_pulse_limits" # Fails on GitHub Actions, probably due to minor floating point arithmetic error. + "test_cx_equivalence" # Fails due to flaky test + "test_two_qubit_synthesis_not_pulse_optimal" # test of random circuit, seems to randomly fail depending on seed + "test_qv_natural" # fails due to sign error. Not sure why + ] ++ lib.optionals (lib.versionAtLeast matplotlib.version "3.4.0") [ + "test_plot_circuit_layout" ] # Disabling slow tests for build constraints ++ [ @@ -147,6 +148,12 @@ buildPythonPackage rec { "test_qaoa_qc_mixer_4" "test_abelian_grouper_random_2" "test_pauli_two_design" + "test_shor_factoring" + "test_sample_counts_memory_ghz" + "test_two_qubit_weyl_decomposition_ab0" + "test_sample_counts_memory_superposition" + "test_piecewise_polynomial_function" + "test_vqe_qasm" ]; # Moves tests to $PACKAGEDIR/test. They can't be run from /build because of finding diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 6cc24be1958..45e0326a1b7 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -8,14 +8,28 @@ , qiskit-ibmq-provider , qiskit-ignis , qiskit-terra + # Optional inputs +, withOptionalPackages ? true +, qiskit-finance +, qiskit-machine-learning +, qiskit-nature +, qiskit-optimization # Check Inputs , pytestCheckHook }: +let + optionalQiskitPackages = [ + qiskit-finance + qiskit-machine-learning + qiskit-nature + qiskit-optimization + ]; +in buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.26.2"; + version = "0.32.0"; disabled = pythonOlder "3.6"; @@ -23,7 +37,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = "qiskit"; rev = version; - hash = "sha256-QYWKKS7e/uCt5puWV4jA9Emp7M4Cyv2RUCxilbChWhw="; + sha256 = "sha256-fKR072hOD0a9TtWulqyKUT3Riwq+NHTtciR+NN5JC1Y="; }; propagatedBuildInputs = [ @@ -32,7 +46,7 @@ buildPythonPackage rec { qiskit-ibmq-provider qiskit-ignis qiskit-terra - ]; + ] ++ lib.optionals withOptionalPackages optionalQiskitPackages; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/tweedledum/default.nix b/pkgs/development/python-modules/tweedledum/default.nix index 4b24b3ff4ef..81f0dad52eb 100644 --- a/pkgs/development/python-modules/tweedledum/default.nix +++ b/pkgs/development/python-modules/tweedledum/default.nix @@ -4,18 +4,20 @@ , cmake , ninja , scikit-build + # Check Inputs +, pytestCheckHook }: buildPythonPackage rec { pname = "tweedledum"; - version = "1.0.0"; + version = "1.1.1"; format = "pyproject"; src = fetchFromGitHub{ owner = "boschmitt"; repo = "tweedledum"; rev = "v${version}"; - hash = "sha256-59lJzdw9HLJ9ADxp/a3KW4v5aU/dYm27NSYoz9D49i4="; + sha256 = "sha256-wgrY5ajaMYxznyNvlD0ul1PFr3W8oV9I/OVsStlZEBM="; }; nativeBuildInputs = [ cmake ninja scikit-build ]; @@ -23,10 +25,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "tweedledum" ]; - # TODO: use pytest, but had issues with finding the correct directories - checkPhase = '' - python -m unittest discover -s ./python/test -t . - ''; + checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "python/test" ]; meta = with lib; { description = "A library for synthesizing and manipulating quantum circuits"; diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index a3b41aa03e2..67f6b3a76f3 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -18,11 +18,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2021.5.29"; + version = "2021.11.9"; src = fetchPypi { inherit pname version; - sha256 = "05958fadcd70b2de6a27542fcd2bd72dd5c59c6d35307fdac3e06361fb06e30e"; + sha256 = "7662399162bc887ee86e96d0baa6984236228af9c1fd6594be0b18910225579d"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/pypi-mirror/default.nix b/pkgs/development/tools/pypi-mirror/default.nix index 945fafa7648..54bc09d6b9a 100644 --- a/pkgs/development/tools/pypi-mirror/default.nix +++ b/pkgs/development/tools/pypi-mirror/default.nix @@ -4,13 +4,13 @@ }: python3.pkgs.buildPythonApplication rec { pname = "pypi-mirror"; - version = "4.0.7"; + version = "4.1.0"; src = fetchFromGitHub { owner = "montag451"; repo = pname; rev = "v${version}"; - sha256 = "0sjzjvq2jnsr5mfyvkww3rfk3k5xcl8wa07q614850m0sn907laz"; + sha256 = "077f3asi5fdbb2j2ll4xdwv7ndfbfr81bpn3zi55h6idfdc7zzc0"; }; pythonImportsCheck = [ "pypi_mirror" ]; diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 1fdd0647557..b642314737c 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -9,9 +9,9 @@ let sha256 = "sha256-h7sCjUcP0bhRaTSbRMVdW3M3M9wtUN3xGW4CZyXq0DQ="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config gperf ]; buildInputs = [ - glib gperf util-linux kmod + glib util-linux kmod ]; in stdenv.mkDerivation { diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index a785ce86882..f9cab463186 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -748,6 +748,7 @@ let BSD_PROCESS_ACCT_V3 = yes; + BT_HCIBTUSB_MTK = whenAtLeast "5.3" yes; # MediaTek protocol support BT_HCIUART_BCSP = option yes; BT_HCIUART_H4 = option yes; # UART (H4) protocol support BT_HCIUART_LL = option yes; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index da4332711b3..c98b054e52f 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -78,6 +78,18 @@ let }); }) + (self: super: { + nettigo-air-monitor = super.nettigo-air-monitor.overridePythonAttrs (oldAttrs: rec { + version = "1.1.1"; + src = fetchFromGitHub { + owner = "bieniu"; + repo = "nettigo-air-monitor"; + rev = version; + sha256 = "sha256-OIB1d6XtstUr5P0q/dmyJS7+UbtkFQIiuSnzwcdP1mE="; + }; + }); + }) + # Pinned due to API changes in pyruckus>0.12 (self: super: { pyruckus = super.pyruckus.overridePythonAttrs (oldAttrs: rec { @@ -813,8 +825,9 @@ in with py.pkgs; buildPythonApplication rec { "tests/auth/mfa_modules/test_notify.py" # emulated_hue/test_upnp.py: Tries to establish the public ipv4 address "tests/components/emulated_hue/test_upnp.py" - # tado/test_climate.py: Tries to connect to my.tado.com + # tado/test_{climate,water_heater}.py: Tries to connect to my.tado.com "tests/components/tado/test_climate.py" + "tests/components/tado/test_water_heater.py" ]; disabledTests = [ diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 051497f863c..ebd8d26de12 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2021-09-21"; + version = "unstable-2021-11-10"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "0b918b357cb0c282d53cbdf59e1931a2054cd60a"; - sha256 = "sha256-vUhP71vZ5XFG7MDkPFpAcCUL4kIdzHJ1hAkwqIi6ksQ="; + rev = "c179db3d4331db9d85c7acfdaa1e96e295d277ba"; + sha256 = "sha256-/fFbhKiSQq9E9iucinTgUTyOtfDKCMgvzebHjfOaJ+M="; }; sourceRoot = "source/klippy"; diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index 8311d0aa58f..3daa69de492 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -16,14 +16,14 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-wrBfgwzb+HI6cu9EyC70xZ5WsfkW+o+Q69jeCjoZRtI="; - arm64-linux_hash = "sha256-wnuLqd1T/21QyqjHbpK2w+WRyW1rd4pHqcRLFrIKHW8="; - x64-osx_hash = "sha256-gu+eByulCs9zLe3AXfVfcOXB49q6V7MWQ2DN2O/enfk="; + x64-linux_hash = "sha256-S3ktqBapIi6YIjDOIMziCzecS86hR2LIUey3SLNuWgg="; + arm64-linux_hash = "sha256-lxPglw3whyMQ+v7GpKMygxqINDoczKmh7KpGAuzuQwM="; + x64-osx_hash = "sha256-EUg3eC5QwGgCSi9qAPs6s8wenSXEmLvLHUTlvoLWAtc="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "prowlarr"; - version = "0.1.1.1030"; + version = "0.1.2.1060"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 6d484e41dae..1560cba17f8 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-10-27"; + version = "2021-11-11"; pname = "oh-my-zsh"; - rev = "2e46b2a2dcb96cadd94283bdce95eca75bef1433"; + rev = "b3ba9978cc42a5031c7b68e3cf917ec2e64643bc"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "ZZs7SBfRX1JUmjukvnOqMx77vXgoxqHEatGfRvfToK8="; + sha256 = "9a5eVMphQ0jay9ogc/9ZFS+vvHlXhPYCCo8kMdgVsnA="; }; installPhase = '' diff --git a/pkgs/shells/zsh/zinit/default.nix b/pkgs/shells/zsh/zinit/default.nix index d59f50ce3b9..126ed8e67c6 100644 --- a/pkgs/shells/zsh/zinit/default.nix +++ b/pkgs/shells/zsh/zinit/default.nix @@ -4,7 +4,7 @@ stdenvNoCC.mkDerivation rec { pname = "zinit"; version = "3.7"; src = fetchFromGitHub { - owner = "zdharma"; + owner = "zdharma-continuum"; repo = pname; rev = "v${version}"; hash = "sha256-B+cTGz+U8MR22l6xXdRAAjDr+ulCk+CJ9GllFMK0axE="; @@ -37,6 +37,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/zdharma/zinit"; description = "Flexible zsh plugin manager"; license = licenses.mit; - maintainers = with maintainers; [ pasqui23 ]; + maintainers = with maintainers; [ pasqui23 sei40kr ]; }; } diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 136da49491b..f10b79d2ab0 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2021.10.11"; + version = "2021.10.15"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "sha256-2M6nCJD1ovW8Wzw+ucii5PjeNTOiTletor7MPCMPl38="; + sha256 = "sha256-OEkSgT3Rg0ZcTCTeOd2+GlopzhI19spOLkH3nDDCWo8="; }; meta = with lib; { diff --git a/pkgs/tools/graphics/wallutils/default.nix b/pkgs/tools/graphics/wallutils/default.nix index 7425056cfae..d7c37bb2742 100644 --- a/pkgs/tools/graphics/wallutils/default.nix +++ b/pkgs/tools/graphics/wallutils/default.nix @@ -1,16 +1,17 @@ { buildGoPackage, fetchFromGitHub, lib -, wayland, libX11, xbitmaps, libXcursor, libXmu, libXpm +, pkg-config +, wayland, libX11, xbitmaps, libXcursor, libXmu, libXpm, libheif }: buildGoPackage rec { pname = "wallutils"; - version = "5.9.0"; + version = "5.10.0"; src = fetchFromGitHub { owner = "xyproto"; repo = "wallutils"; rev = version; - sha256 = "17xw1311xpmi5c8mwa9yvn4pxa7g4n09j84lvy61gmxc5m128fwy"; + sha256 = "1phlkpy8kg4ai2xmachpbbxvl8fga9hqqbad2a2121yl60709l1k"; }; goPackagePath = "github.com/xyproto/wallutils"; @@ -22,13 +23,14 @@ buildGoPackage rec { sed -iE 's/VersionString = "[0-9].[0-9].[0-9]"/VersionString = "${version}"/' wallutils.go ''; - buildInputs = [ wayland libX11 xbitmaps libXcursor libXmu libXpm ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ wayland libX11 xbitmaps libXcursor libXmu libXpm libheif ]; meta = with lib; { description = "Utilities for handling monitors, resolutions, and (timed) wallpapers"; inherit (src.meta) homepage; license = licenses.mit; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index 7605c92bf43..6c4f71c507e 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "flameshot"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; rev = "v${version}"; - sha256 = "1ncknjayl6am740f49g0lc28z1zsifbicxz1j1kwps3ksj15nl7a"; + sha256 = "sha256-rZUiaS32C77tFJmEkw/9MGbVTVscb6LOCyWaWO5FyR4="; }; patches = [ diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/tools/networking/horst/default.nix index 194365130bf..331738be532 100644 --- a/pkgs/tools/networking/horst/default.nix +++ b/pkgs/tools/networking/horst/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, pkg-config, ncurses, libnl }: +{lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, ncurses, libnl }: stdenv.mkDerivation rec { pname = "horst"; @@ -11,6 +11,22 @@ stdenv.mkDerivation rec { sha256 = "140pyv6rlsh4c745w4b59pz3hrarr39qq3mz9z1lsd3avc12nx1a"; }; + patches = [ + # Fix pending upstream inclusion for ncurses-6.3: + # https://github.com/br101/horst/pull/110 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/br101/horst/commit/c9e9b6cc1f97edb9c53f3a67b43f3588f3ac6ea7.patch"; + sha256 = "15pahbnql44d5zzxmkd5ky8bl3c3hh3lh5190wynd90jrrhf1a26"; + # collides for context change, well apply this part in postPatch + excludes = [ "display-main.c" ]; + }) + ]; + postPatch = '' + # Apply second part of ncurses-6.3.patch: + substituteInPlace display-main.c --replace 'wprintw(dump_win, str);' 'wprintw(dump_win, "%s", str);' + ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses libnl ]; diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index 1345e2caa40..fd3b4a5a3e4 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonApplication , fetchFromGitHub -, nixUnstable +, nix , nix-prefetch , nixpkgs-fmt , nixpkgs-review @@ -19,7 +19,7 @@ buildPythonApplication rec { }; makeWrapperArgs = [ - "--prefix" "PATH" ":" (lib.makeBinPath [ nixUnstable nix-prefetch nixpkgs-fmt nixpkgs-review ]) + "--prefix" "PATH" ":" (lib.makeBinPath [ nix nix-prefetch nixpkgs-fmt nixpkgs-review ]) ]; checkPhase = '' diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 6a099299e90..3555f65c40d 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.12.8"; + version = "1.13.0"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "0f3nnhipx2p8w04rxva0pcf7g1nhr4f5bz5dbvr2m76lkiaz5q3v"; + sha256 = "sha256-MBpk84H3Ng/+rCjW2Scm/su0/5kgs7IzvFk/bFLNzXY="; }; - vendorSha256 = "14khs15k9d5m5dms3l4a5bi0s3zl1irm0i4s9pf86gpyz7b55l6a"; + vendorSha256 = "sha256-HGc6jUp4WO5P5dwfa0r7+X78a8us9fWrf+/IOotZHqk="; subPackages = [ "." ]; diff --git a/pkgs/tools/text/proselint/default.nix b/pkgs/tools/text/proselint/default.nix index d00b71977a2..3f1b79c3e01 100644 --- a/pkgs/tools/text/proselint/default.nix +++ b/pkgs/tools/text/proselint/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "proselint"; - version = "0.12.0"; + version = "0.13.0"; doCheck = false; # fails to pass because it tries to run in home directory src = fetchurl { url = "mirror://pypi/p/proselint/${pname}-${version}.tar.gz"; - sha256 = "2a98d9c14382d94ed9122a6c0b0657a814cd5c892c77d9477309fc99f86592e6"; + sha256 = "7dd2b63cc2aa390877c4144fcd3c80706817e860b017f04882fbcd2ab0852a58"; }; propagatedBuildInputs = [ click future six ]; diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index 1e6c86c1992..c64136ad6b9 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "scdoc"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = pname; rev = version; - sha256 = "1g37j847j3h4a4qbbfbr6vvsxpifj9v25jgv25nd71d1n0dxlhvk"; + sha256 = "07c2vmdgqifbynm19zjnrk7h102pzrriv73izmx8pmd7b3xl5mfq"; }; postPatch = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f2474393f95..e9a151f1c7b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7915,16 +7915,24 @@ in { qimage2ndarray = callPackage ../development/python-modules/qimage2ndarray { }; + qiskit = callPackage ../development/python-modules/qiskit { }; + qiskit-aer = callPackage ../development/python-modules/qiskit-aer { }; qiskit-aqua = callPackage ../development/python-modules/qiskit-aqua { }; - qiskit = callPackage ../development/python-modules/qiskit { }; + qiskit-finance = callPackage ../development/python-modules/qiskit-finance { }; qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { }; qiskit-ignis = callPackage ../development/python-modules/qiskit-ignis { }; + qiskit-machine-learning = callPackage ../development/python-modules/qiskit-machine-learning { }; + + qiskit-nature = callPackage ../development/python-modules/qiskit-nature { }; + + qiskit-optimization = callPackage ../development/python-modules/qiskit-optimization { }; + qiskit-terra = callPackage ../development/python-modules/qiskit-terra { }; qrcode = callPackage ../development/python-modules/qrcode { }; |