diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 719f61203d22..d85ff2d08a57 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -219,9 +219,9 @@ # Podman, CRI-O modules and related /nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq @adisbladis /nixos/modules/virtualisation/cri-o.nix @NixOS/podman @zowoq @adisbladis -/nixos/modules/virtualisation/podman.nix @NixOS/podman @zowoq @adisbladis +/nixos/modules/virtualisation/podman @NixOS/podman @zowoq @adisbladis /nixos/tests/cri-o.nix @NixOS/podman @zowoq @adisbladis -/nixos/tests/podman.nix @NixOS/podman @zowoq @adisbladis +/nixos/tests/podman @NixOS/podman @zowoq @adisbladis # Docker tools /pkgs/build-support/docker @roberth @utdemir diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8cb7c39005c5..c83a69233384 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1192,8 +1192,7 @@ ./virtualisation/kvmgt.nix ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix - ./virtualisation/podman.nix - ./virtualisation/podman-network-socket-ghostunnel.nix + ./virtualisation/podman/default.nix ./virtualisation/qemu-guest-agent.nix ./virtualisation/railcar.nix ./virtualisation/spice-usb-redirection.nix diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman/default.nix similarity index 98% rename from nixos/modules/virtualisation/podman.nix rename to nixos/modules/virtualisation/podman/default.nix index 385475c84a1a..94fd727a4b56 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -39,8 +39,8 @@ let in { imports = [ - ./podman-dnsname.nix - ./podman-network-socket.nix + ./dnsname.nix + ./network-socket.nix (lib.mkRenamedOptionModule [ "virtualisation" "podman" "libpod" ] [ "virtualisation" "containers" "containersConf" ]) ]; diff --git a/nixos/modules/virtualisation/podman-dnsname.nix b/nixos/modules/virtualisation/podman/dnsname.nix similarity index 100% rename from nixos/modules/virtualisation/podman-dnsname.nix rename to nixos/modules/virtualisation/podman/dnsname.nix diff --git a/nixos/modules/virtualisation/podman-network-socket-ghostunnel.nix b/nixos/modules/virtualisation/podman/network-socket-ghostunnel.nix similarity index 100% rename from nixos/modules/virtualisation/podman-network-socket-ghostunnel.nix rename to nixos/modules/virtualisation/podman/network-socket-ghostunnel.nix diff --git a/nixos/modules/virtualisation/podman-network-socket.nix b/nixos/modules/virtualisation/podman/network-socket.nix similarity index 97% rename from nixos/modules/virtualisation/podman-network-socket.nix rename to nixos/modules/virtualisation/podman/network-socket.nix index 1429164630b3..94d8da9d2b61 100644 --- a/nixos/modules/virtualisation/podman-network-socket.nix +++ b/nixos/modules/virtualisation/podman/network-socket.nix @@ -9,6 +9,10 @@ let in { + imports = [ + ./network-socket-ghostunnel.nix + ]; + options.virtualisation.podman.networkSocket = { enable = mkOption { type = types.bool; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 63be67892017..a1113ff631e3 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -369,9 +369,9 @@ in plikd = handleTest ./plikd.nix {}; plotinus = handleTest ./plotinus.nix {}; podgrab = handleTest ./podgrab.nix {}; - podman = handleTestOn ["x86_64-linux"] ./podman.nix {}; - podman-dnsname = handleTestOn ["x86_64-linux"] ./podman-dnsname.nix {}; - podman-tls-ghostunnel = handleTestOn ["x86_64-linux"] ./podman-tls-ghostunnel.nix {}; + podman = handleTestOn ["x86_64-linux"] ./podman/default.nix {}; + podman-dnsname = handleTestOn ["x86_64-linux"] ./podman/dnsname.nix {}; + podman-tls-ghostunnel = handleTestOn ["x86_64-linux"] ./podman/tls-ghostunnel.nix {}; pomerium = handleTestOn ["x86_64-linux"] ./pomerium.nix {}; postfix = handleTest ./postfix.nix {}; postfix-raise-smtpd-tls-security-level = handleTest ./postfix-raise-smtpd-tls-security-level.nix {}; diff --git a/nixos/tests/podman.nix b/nixos/tests/podman/default.nix similarity index 99% rename from nixos/tests/podman.nix rename to nixos/tests/podman/default.nix index 7eae575fd7f0..b52a7f060ad6 100644 --- a/nixos/tests/podman.nix +++ b/nixos/tests/podman/default.nix @@ -1,6 +1,6 @@ # This test runs podman and checks if simple container starts -import ./make-test-python.nix ( +import ../make-test-python.nix ( { pkgs, lib, ... }: { name = "podman"; meta = { diff --git a/nixos/tests/podman-dnsname.nix b/nixos/tests/podman/dnsname.nix similarity index 97% rename from nixos/tests/podman-dnsname.nix rename to nixos/tests/podman/dnsname.nix index dd352f754dcf..3768ae79e067 100644 --- a/nixos/tests/podman-dnsname.nix +++ b/nixos/tests/podman/dnsname.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ( +import ../make-test-python.nix ( { pkgs, lib, ... }: let inherit (pkgs) writeTextDir python3 curl; diff --git a/nixos/tests/podman-tls-ghostunnel.nix b/nixos/tests/podman/tls-ghostunnel.nix similarity index 99% rename from nixos/tests/podman-tls-ghostunnel.nix rename to nixos/tests/podman/tls-ghostunnel.nix index 0e687b199b26..c0bc47cc40b1 100644 --- a/nixos/tests/podman-tls-ghostunnel.nix +++ b/nixos/tests/podman/tls-ghostunnel.nix @@ -1,7 +1,7 @@ /* This test runs podman as a backend for the Docker CLI. */ -import ./make-test-python.nix ( +import ../make-test-python.nix ( { pkgs, lib, ... }: let gen-ca = pkgs.writeScript "gen-ca" '' diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index aa3ed2c8b3d2..a071b36abf0a 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "4.1"; + version = "4.1.1"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-h6TNlfKgN7CPhtY8DxESrydtEsdVPT+Uf+VKcqKVuXw="; + sha256 = "sha256-bhd3Ij4y1r5pHrpQkbHuMTNl8Z3w0HsbCkr1C0CVFvQ="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index 86fcb2c72229..861fa2eb97ef 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube3d"; - version = "5.2.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "sha256-xtYoyA5tcCjNbDysZn5yFQtMKLIu6DOHKH5vDMDCrZQ="; + sha256 = "sha256-rKiOPpRupoCRtGJ3DVBUY9483EEBxaaECZRdWiyxaEk="; }; vendorSha256 = null; diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index 9276ccac6fd2..446952b30051 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "openwsman"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "Openwsman"; repo = "openwsman"; rev = "v${version}"; - sha256 = "19dj38jyzhhhvk863cikcwk5awzlq3337pxmsaqqm4wrcygrkfmx"; + sha256 = "sha256-/fSVzpGPObMkJIu7j6eR6A7Gtf2jttoPhcSayBvn3IU="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/ocaml-modules/graphics/default.nix b/pkgs/development/ocaml-modules/graphics/default.nix index 10d0b4ea6fc7..38db74fc9faf 100644 --- a/pkgs/development/ocaml-modules/graphics/default.nix +++ b/pkgs/development/ocaml-modules/graphics/default.nix @@ -3,13 +3,13 @@ buildDunePackage rec { pname = "graphics"; - version = "5.1.1"; + version = "5.1.2"; useDune2 = true; src = fetchurl { url = "https://github.com/ocaml/graphics/releases/download/${version}/graphics-${version}.tbz"; - sha256 = "sha256-KGyD497ZKHA2xeXHezmh3P1zoSlre1h5N9zjkAFmMo4="; + sha256 = "sha256-QA/YHSPxy0FGuWl5NCwkeXHdVPWHn/0vgOx80CEuMtQ="; }; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix deleted file mode 100644 index 8056cd181d53..000000000000 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi }: - -buildPythonPackage rec { - pname = "zc.buildout"; - version = "2.13.6"; - - src = fetchPypi { - inherit pname version; - sha256 = "ac6edd48b1d7b1fba383dd0840fd49c53266f6bd426111a0195bcc640f4aff0f"; - }; - - patches = [ ./nix.patch ]; - - postInstall = "mv $out/bin/buildout{,-nix}"; - - meta = with lib; { - homepage = "http://www.buildout.org"; - description = "A software build and configuration system"; - license = licenses.zpl21; - maintainers = [ maintainers.goibhniu ]; - }; -} diff --git a/pkgs/development/python-modules/buildout-nix/nix.patch b/pkgs/development/python-modules/buildout-nix/nix.patch deleted file mode 100644 index 49f3c6d90f0a..000000000000 --- a/pkgs/development/python-modules/buildout-nix/nix.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/src/zc/buildout/buildout.py 2017-08-18 10:06:24.946428977 +0300 -+++ b/src/zc/buildout/buildout.py 2017-08-18 10:08:49.115613364 +0300 -@@ -382,6 +382,10 @@ - if k not in versions - )) - -+ # Override versions with available (nix) system packages -+ for dist in pkg_resources.working_set: -+ versions[dist.project_name] = SectionKey(dist.version, dist.location) -+ - # Absolutize some particular directory, handling also the ~/foo form, - # and considering the location of the configuration file that generated - # the setting as the base path, falling back to the main configuration ---- a/src/zc/buildout/easy_install.py 2017-08-18 10:06:24.948428980 +0300 -+++ b/src/zc/buildout/easy_install.py 2017-08-18 10:07:37.462521740 +0300 -@@ -321,6 +321,12 @@ - - def _satisfied(self, req, source=None): - dists = [dist for dist in self._env[req.project_name] if dist in req] -+ try: -+ dists = ([dist for dist in dists -+ if dist.precedence == pkg_resources.DEVELOP_DIST] -+ + [pkg_resources.get_distribution(req.project_name)]) -+ except pkg_resources.DistributionNotFound: -+ pass - if not dists: - logger.debug('We have no distributions for %s that satisfies %r.', - req.project_name, str(req)) diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index 73d172941c2e..d55c1e9b0c53 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "cartopy"; - version = "0.20.0"; + version = "0.20.1"; src = fetchPypi { inherit version; pname = "Cartopy"; - sha256 = "eae58aff26806e63cf115b2bce9477cedc4aa9f578c5e477b2c25cfa404f2b7a"; + sha256 = "91f87b130e2574547a20cd634498df97d797abd12dcfd0235bc0cdbcec8b05e3"; }; postPatch = '' diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 31cb3fd5ffe4..e65e6f0d808e 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.21.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0sbhg8gdcszi4q5091s1by0hz6qxpkdfazs5lbfrlw33fkck2d3i"; + sha256 = "1wrk5rhds6a69vbs1bda0zhwpvjhd8i20did6j3kydbas3zbr516"; }; sourceRoot = "source/${pname}"; diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix index 2a5dc7efcdf8..23c911f8e4a6 100644 --- a/pkgs/development/python-modules/cloudsplaining/default.nix +++ b/pkgs/development/python-modules/cloudsplaining/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "cloudsplaining"; - version = "0.4.8"; + version = "0.4.9"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = pname; rev = version; - sha256 = "sha256-t1eSPa1KqzUB2xYGkU10lVIZQ3CcIHiZZtTa0j2TUGc="; + sha256 = "sha256-87ZUYHN64gnbF2g9BjPFNbwMaGFxAy3Yb8UdT3BUqC0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index bece30159537..ee47645ddc73 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "4.1.0"; + version = "4.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "browniebroke"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E1xXtvAcYIi2xxaX+3yMkkvRz+Gt6Nx0JRqV1nI/Ldo="; + sha256 = "0wljf3ri8jcg4df6m61k8s5nm9rncwa8c46pfv901bc737kyslpl"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index 7dfd6e071fe0..aa88147ae7fd 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -6,6 +6,7 @@ , pynacl , pythonOlder , withVoice ? true +, ffmpeg }: buildPythonPackage rec { @@ -24,9 +25,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - ] ++ lib.optionalString withVoice [ + ] ++ lib.optionals withVoice [ libopus pynacl + ffmpeg ]; patchPhase = '' @@ -34,6 +36,9 @@ buildPythonPackage rec { --replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus.so.0'" substituteInPlace requirements.txt \ --replace "aiohttp>=3.6.0,<3.8.0" "aiohttp>=3.6.0,<4" + '' + lib.optionalString withVoice '' + substituteInPlace "discord/player.py" \ + --replace "executable='ffmpeg'" "executable='${ffmpeg}/bin/ffmpeg'" ''; # Only have integration tests with discord diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index f7cdca223078..1497b412d741 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "emoji"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "carpedm20"; repo = pname; rev = "v${version}"; - sha256 = "0x18l8jgbki9yqx994w97dagfaqrbxi3sy2l2101is1dfjr0kib6"; + sha256 = "1g927w9l3j5mycg6pqa4vjk2lyy35sppfp8pbzb6mvca500001rk"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/lc7001/default.nix b/pkgs/development/python-modules/lc7001/default.nix index 32c3ddd5a135..0683794eda50 100644 --- a/pkgs/development/python-modules/lc7001/default.nix +++ b/pkgs/development/python-modules/lc7001/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "lc7001"; - version = "1.0.4"; + version = "1.0.5"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1qObmGpu6mU3gdxS8stH+4Zc2NA7W1+pS7fOXALC0Ug="; + sha256 = "sha256-I4I3vwW1kJsgLFPMGpe9hkD3iEeC3AqI4pCi6SCWPx4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/monkeyhex/default.nix b/pkgs/development/python-modules/monkeyhex/default.nix index f627505cbddd..a6261805427d 100644 --- a/pkgs/development/python-modules/monkeyhex/default.nix +++ b/pkgs/development/python-modules/monkeyhex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "monkeyhex"; - version = "1.7.2"; + version = "1.7.3"; src = fetchPypi { inherit pname version; - sha256 = "e2add1f7f1f620be9ccec0618342e6a9e47de50e0d2252628bffd452bfd3762b"; + sha256 = "c121e734ccae8f1be6f1ecaf9100f3f8bde0a2dd03979b8ba42c474b1978806e"; }; propagatedBuildInputs = [ future ]; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 52ba61cf712b..43a684e10dfa 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.38"; + version = "8.12.39"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PNodHOqaaAG6v4JebA9ql3bqbYpouBslYXj45aqBM0Q="; + sha256 = "0f7745e1f108654db347d885e814cbb5f225b8c5f5ce336024b193c79291ddaa"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index b566edef64d1..f839dc4df312 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyatspi"; - version = "2.38.1"; + version = "2.38.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0lc1p6p296c9q3lffi03v902jlsj34i7yyl3rcyaq94wwbljg7z4"; + sha256 = "DnCJwLYwlhS1NiCDazRi1/kShOQ2/kkpuhYZqEHPEYU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/pyskyqremote/default.nix b/pkgs/development/python-modules/pyskyqremote/default.nix new file mode 100644 index 000000000000..7f76407f033d --- /dev/null +++ b/pkgs/development/python-modules/pyskyqremote/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pycountry +, pythonOlder +, requests +, websocket-client +, xmltodict +}: + +buildPythonPackage rec { + pname = "pyskyqremote"; + version = "0.2.49"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "RogerSelwyn"; + repo = "skyq_remote"; + rev = version; + sha256 = "sha256-Xhr+p/kIp3Sm7swqCsjXHaECntwJnBLyGlcSg2lsxZc="; + }; + + propagatedBuildInputs = [ + pycountry + requests + websocket-client + xmltodict + ]; + + # Project has no tests, only a test script which looks like anusage example + doCheck = false; + + pythonImportsCheck = [ + "pyskyqremote" + ]; + + meta = with lib; { + description = "Python module for accessing SkyQ boxes"; + homepage = "https://github.com/RogerSelwyn/skyq_remote"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix index ef06ed1bf4f0..afa04dfe937a 100644 --- a/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { # upstream has abandoned project in favor of pytest-flake8 # retaining package to not break other packages pname = "pytest-flakes"; - version = "4.0.4"; + version = "4.0.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "551467a129331bed83596f3145d9eaf6541c26a03dc1b36419efef8ae231341b"; + sha256 = "953134e97215ae31f6879fbd7368c18d43f709dc2fab5b7777db2bb2bac3a924"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix index 88e3e448ade9..98bf1b1da4e2 100644 --- a/pkgs/development/python-modules/pytradfri/default.nix +++ b/pkgs/development/python-modules/pytradfri/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pytradfri"; - version = "7.2.0"; + version = "7.2.1"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "pytradfri"; rev = version; - sha256 = "sha256-/1K2jBgDuOIUb4WUownoceprZbOwSkQIqeEt07HfZrY="; + sha256 = "sha256-4+QdMuwDMLhIIzffHXG+LehuwR9QMcI/CeL5g8wOQfU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index afda360b4127..a5a738187183 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -1,4 +1,7 @@ -{ aiohttp +{ lib +, stdenv +, aiohttp +, asttokens , blinker , botocore , bottle @@ -7,61 +10,127 @@ , certifi , chalice , django +, executing +, fakeredis , falcon -, fetchPypi -, flask +, fetchFromGitHub +, flask_login +, gevent +, httpx , iana-etc , isPy3k +, jsonschema , libredirect +, pure-eval , pyramid +, pyspark +, pytest-django +, pytest-forked +, pytest-localserver +, pytestCheckHook , rq , sanic +, sanic-testing , sqlalchemy -, lib , tornado -, urllib3 , trytond +, urllib3 , werkzeug -, executing -, pure-eval -, asttokens }: buildPythonPackage rec { pname = "sentry-sdk"; version = "1.5.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "789a11a87ca02491896e121efdd64e8fd93327b69e8f2f7d42f03e2569648e88"; + src = fetchFromGitHub { + owner = "getsentry"; + repo = "sentry-python"; + rev = version; + sha256 = "sha256-hJqopR/kvqU0trniHMOahi3oeIzeMvc74ujmfJ2iG48="; }; - checkInputs = [ blinker botocore chalice django flask tornado bottle rq falcon sqlalchemy werkzeug trytond - executing pure-eval asttokens ] - ++ lib.optionals isPy3k [ celery pyramid sanic aiohttp ]; + propagatedBuildInputs = [ + certifi + urllib3 + ]; - propagatedBuildInputs = [ urllib3 certifi ]; + checkInputs = [ + asttokens + blinker + botocore + bottle + chalice + django + executing + fakeredis + falcon + flask_login + gevent + jsonschema + pure-eval + pytest-django + pytest-forked + pytest-localserver + pytestCheckHook + rq + sqlalchemy + tornado + trytond + werkzeug + ] ++ lib.optionals isPy3k [ + aiohttp + celery + httpx + pyramid + pyspark + sanic + sanic-testing + ]; + doCheck = !stdenv.isDarwin; - # The Sentry tests need access to `/etc/protocols` (the tests call - # `socket.getprotobyname('tcp')`, which reads from this file). Normally - # this path isn't available in the sandbox. Therefore, use libredirect - # to make on eavailable from `iana-etc`. This is a test-only operation. - preCheck = lib.optionalString doCheck '' - export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols - export LD_PRELOAD=${libredirect}/lib/libredirect.so - ''; + disabledTests = [ + # Issue with the asseration + "test_auto_enabling_integrations_catches_import_error" + # Output mismatch in sqlalchemy test + "test_too_large_event_truncated" + # Failing falcon tests + "test_has_context" + "uri_template-" + "path-" + "test_falcon_large_json_request" + "test_falcon_empty_json_request" + "test_falcon_raw_data_request" + # Failing spark tests + "test_set_app_properties" + "test_start_sentry_listener" + # Failing threading test + "test_circular_references" + # Failing wsgi test + "test_session_mode_defaults_to_request_mode_in_wsgi_handler" + ]; - postCheck = "unset NIX_REDIRECTS LD_PRELOAD"; + disabledTestPaths = [ + # Some tests are failing (network access, assertion errors) + "tests/integrations/aiohttp/" + "tests/integrations/gcp/" + "tests/integrations/httpx/" + "tests/integrations/stdlib/test_httplib.py" + # Tests are blocking + "tests/integrations/celery/" + # pytest-chalice is not available in nixpkgs yet + "tests/integrations/chalice/" + ]; - # no tests - doCheck = false; - pythonImportsCheck = [ "sentry_sdk" ]; + pythonImportsCheck = [ + "sentry_sdk" + ]; meta = with lib; { + description = "Python SDK for Sentry.io"; homepage = "https://github.com/getsentry/sentry-python"; - description = "New Python SDK for Sentry.io"; license = licenses.bsd2; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ fab gebner ]; }; } diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index ef0bb8a07170..b0705346abdb 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "softlayer"; - version = "5.9.7"; + version = "5.9.8"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = pname; repo = "softlayer-python"; rev = "v${version}"; - sha256 = "0zwhykrpckx3ln4w6vlgp0nrkkr8343ni1w43hxznm55qmrllrpg"; + sha256 = "087kyl2yacvh12i4x3357659mgq4xycv8a4y9rl3rj57kp5jc6ah"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spiderpy/default.nix b/pkgs/development/python-modules/spiderpy/default.nix index 7970bbb84783..82007997ccb8 100644 --- a/pkgs/development/python-modules/spiderpy/default.nix +++ b/pkgs/development/python-modules/spiderpy/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "spiderpy"; - version = "1.7.1"; + version = "1.7.2"; format = "pyproject"; disabled = isPy27; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "peternijssen"; repo = "spiderpy"; rev = version; - sha256 = "sha256-gQ/Y5c8+aSvoJzXI6eQ9rk0xDPxpi0xgO3xBKR+vVrY="; + sha256 = "sha256-Yujy8HSMbK2DQ/913r2c74hKPYDfcHFKq04ysqxG+go="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 5d3416d889b2..64911736cfa2 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "1.4.0"; + version = "1.4.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "v${version}"; - sha256 = "17ld1ciylfc8kmf5iazzrlqqdf434wi5dfjzm68nm5d539gccfss"; + sha256 = "1hnlymdi27rjxaivn5csqrj9ahk86cwvbpvdl29v7qal0y2bc433"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 071843772708..61b56a181337 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -46,13 +46,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.632"; + version = "2.0.641"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-SDMp+QOZy2Ml5V8RHLvmTl/3/KB8iYaW0muakE8PnhA="; + sha256 = "sha256-/WmzMffHaD13aZsz6Ib/yaI+6b3UrexWpPv1oLR+PuM="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/database/litestream/default.nix b/pkgs/development/tools/database/litestream/default.nix index 7468aa55d618..6a7e53e6cf20 100644 --- a/pkgs/development/tools/database/litestream/default.nix +++ b/pkgs/development/tools/database/litestream/default.nix @@ -4,13 +4,13 @@ }: buildGoModule rec { pname = "litestream"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "benbjohnson"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A1okmeX3njyRXFKcXJPSV7Hg8Q/P7WqpGz2HThDdUQo="; + sha256 = "sha256-IEdTLf+fEp19FhwL3IaGT9HGKQoa6HwFox2gf0lvFu4="; }; ldflags = [ diff --git a/pkgs/games/odamex/default.nix b/pkgs/games/odamex/default.nix index 8b58ec67eda4..7905cfaa3855 100644 --- a/pkgs/games/odamex/default.nix +++ b/pkgs/games/odamex/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "odamex"; - version = "0.8.2"; + version = "0.9.5"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-src-${version}.tar.bz2"; - sha256 = "0d4v1l7kghkz1xz92jxlx50x3iy94z7ix1i3209m5j5545qzxrqq"; + sha256 = "sha256-WBqO5fWzemw1kYlY192v0nnZkbIEVuWmjWYMy+1ODPQ="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 76680c3c3c43..93d3f663734f 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "sha256-+sYbzWtowLvy44aqhLEH8mUYUn1DJr9HOgKq3YXlPQI="; + sha256 = "sha256-2J2MCByLxTbfx7Q3uWWiZcB+JM9RQv8mshtMxKMTnjI="; }; postPatch = '' diff --git a/pkgs/tools/cd-dvd/nrg2iso/default.nix b/pkgs/tools/cd-dvd/nrg2iso/default.nix index e57948a80dd6..c0f74b8cddc7 100644 --- a/pkgs/tools/cd-dvd/nrg2iso/default.nix +++ b/pkgs/tools/cd-dvd/nrg2iso/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nrg2iso"; - version = "0.4"; + version = "0.4.1"; src = fetchurl { url = "http://gregory.kokanosky.free.fr/v4/linux/${pname}-${version}.tar.gz"; - sha256 = "18sam7yy50rbfhjixwd7wx7kmfn1x1y5j80vwfxi5v408s39s115"; + sha256 = "sha256-O+NqQWdY/BkQRztJqNrfKiqj1R8ZdhlzNrwXS8HjBuU="; }; installPhase = '' diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 913367084ed2..5975b30ac143 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -104,21 +104,7 @@ let meta = getMeta "Ceph common module for code shared by manager modules"; }; - python = python3.override { - packageOverrides = self: super: { - # scipy > 1.3 breaks diskprediction_local, leading to mgr hang on startup - # Bump once these issues are resolved: - # https://tracker.ceph.com/issues/42764 https://tracker.ceph.com/issues/45147 - scipy = super.scipy.overridePythonAttrs (oldAttrs: rec { - version = "1.3.3"; - src = oldAttrs.src.override { - inherit version; - sha256 = "02iqb7ws7fw5fd1a83hx705pzrw1imj7z0bphjsl4bfvw254xgv4"; - }; - doCheck = false; - }); - }; - }; + python = python3; ceph-python-env = python.withPackages (ps: [ ps.sphinx @@ -146,10 +132,10 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "16.2.6"; + version = "16.2.7"; src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "sha256-TXGyZnyVTYAf7G7BcTv3dAfK/54JfOKObcyTRhCrnYA="; + sha256 = "0n7vpdcxji49bqaa5b7zxif1r80rrkbh0dfacbibvf20kzzbn2fz"; }; in rec { ceph = stdenv.mkDerivation { diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix index 0a74deea17d5..31979d3aa979 100644 --- a/pkgs/tools/networking/obfs4/default.nix +++ b/pkgs/tools/networking/obfs4/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "obfs4"; - version = "0.0.10"; + version = "0.0.11"; src = fetchgit { url = meta.repositories.git; rev = "refs/tags/${pname}proxy-${version}"; - sha256 = "05aqmw8x8s0yqyqmdj5zcsq06gsbcmrlcd52gaqm20m1pg9503ad"; + sha256 = "sha256-VjJ/Pc1YjNB2iLnN/5CxuaxolcaR1IMWgoESMzOXU/g="; }; - vendorSha256 = "0h3gjxv26pc6cysvy1hny2f4abw6i847dk8fx0m113ixx9qghk87"; + vendorSha256 = "sha256-xGCK8biTYcrmKbsl6ZyCjpRrVP9x5xGrC3VcMsR7ETo="; doCheck = false; diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix index 647cfd4a44ff..de8b3d699603 100644 --- a/pkgs/tools/networking/ofono/default.nix +++ b/pkgs/tools/networking/ofono/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "ofono"; - version = "1.32"; + version = "1.33"; outputs = [ "out" "dev" ]; src = fetchgit { url = "git://git.kernel.org/pub/scm/network/ofono/ofono.git"; rev = version; - sha256 = "sha256-bJ7Qgau5soPiptrhcMZ8rWxfprRCTeR7OjQ5HZQ9hbc="; + sha256 = "sha256-UTFP69yv1epVrqBoRKCRcR2WiKBG01sLTzrsh/Nude4="; }; patches = [ diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index e02782cccbfd..30495b918462 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "openfortivpn"; - version = "1.16.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "adrienverge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wijP9VGKXlxCAU3xN6+cv9+NGwBS55ql8WsZZ592b/k="; + sha256 = "sha256-wSbE3vq9/o1r80zRT1rO9zAG6ws1nG18ALXYd9BAbLA="; }; # we cannot write the config file to /etc and as we don't need the file, so drop it diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4c14877d1558..f8c8306f8313 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -106,4 +106,5 @@ mapAliases ({ WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29 websocket_client = websocket-client; # added 2021-06-15 zc-buildout221 = zc-buildout; # added 2021-07-21 + zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 35b61d98422d..51a2533e19dc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5892,6 +5892,8 @@ in { pyskyqhub = callPackage ../development/python-modules/pyskyqhub { }; + pyskyqremote = callPackage ../development/python-modules/pyskyqremote { }; + pysolcast = callPackage ../development/python-modules/pysolcast { }; pysyncthru = callPackage ../development/python-modules/pysyncthru { }; @@ -10372,8 +10374,6 @@ in { zc-buildout = callPackage ../development/python-modules/buildout { }; - zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; - zc_lockfile = callPackage ../development/python-modules/zc_lockfile { }; zconfig = callPackage ../development/python-modules/zconfig { };