diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index d5f41af336a7..c64a49f270e1 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -60,7 +60,7 @@ writeScript "update-${pname}" '' # this is a list of sha256 and tarballs for both arches # Upstream files contains python repr strings like b'somehash', hence the sed dance - shasums=`cat $HOME/shasums | sed -E s/"b'([a-f0-9]{64})'?(.*)"/'\1\2'/ | grep tar.xz` + shasums=`cat $HOME/shasums | sed -E s/"b'([a-f0-9]{64})'?(.*)"/'\1\2'/ | grep '\.tar\.[a-z0-9]\+'` cat > $tmpfile <> $tmpfile < resolv.conf - export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) - export LD_PRELOAD=${libredirect}/lib/libredirect.so sed -i '/testpolicy/d' test.py rm testpolicy.py ''; diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 8448b656ce1d..91209292772d 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { nativeCheckInputs = [ eventlet + libredirect.hook mock tornado pytest-asyncio @@ -56,8 +57,7 @@ buildPythonPackage rec { preCheck = lib.optionalString stdenv.hostPlatform.isLinux '' echo "nameserver 127.0.0.1" > resolv.conf - export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \ - LD_PRELOAD=${libredirect}/lib/libredirect.so + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) ''; postCheck = '' diff --git a/pkgs/development/python-modules/rlax/default.nix b/pkgs/development/python-modules/rlax/default.nix index 9cd994e00d47..c74c35c76ed9 100644 --- a/pkgs/development/python-modules/rlax/default.nix +++ b/pkgs/development/python-modules/rlax/default.nix @@ -3,6 +3,11 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, + + # build-system + setuptools, + + # dependencies absl-py, chex, distrax, @@ -11,6 +16,8 @@ jaxlib, numpy, tensorflow-probability, + + # tests dm-haiku, optax, pytest-xdist, @@ -20,7 +27,7 @@ buildPythonPackage rec { pname = "rlax"; version = "0.1.6"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "google-deepmind"; @@ -38,7 +45,11 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ absl-py chex distrax @@ -59,7 +70,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "rlax" ]; disabledTests = [ - # RuntimeErrors + # AssertionError: Array(2, dtype=int32) != 0 + "test_categorical_sample__with_device" + "test_categorical_sample__with_jit" + "test_categorical_sample__without_device" + "test_categorical_sample__without_jit" + + # RuntimeError: Attempted to set 4 devices, but 1 CPUs already available: + # ensure that `set_n_cpu_devices` is executed before any JAX operation. "test_cross_replica_scatter_add0" "test_cross_replica_scatter_add1" "test_cross_replica_scatter_add2" @@ -73,10 +91,11 @@ buildPythonPackage rec { "test_unnormalize_linear" ]; - meta = with lib; { + meta = { description = "Library of reinforcement learning building blocks in JAX"; homepage = "https://github.com/deepmind/rlax"; - license = licenses.asl20; - maintainers = with maintainers; [ onny ]; + changelog = "https://github.com/google-deepmind/rlax/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ onny ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93edeecdf642..05855c6c549a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16099,7 +16099,6 @@ with pkgs; deliantra-maps = callPackage ../games/deliantra/maps.nix { }; deliantra-data = callPackage ../games/deliantra/data.nix { }; - ddnet = callPackage ../games/ddnet {}; ddnet-server = ddnet.override { buildClient = false; }; devilutionx = callPackage ../games/devilutionx { @@ -18055,8 +18054,6 @@ with pkgs; pinentry = pinentry-curses; }; - serial-studio = libsForQt5.callPackage ../applications/misc/serial-studio { }; - maphosts = callPackage ../tools/networking/maphosts { }; tora = libsForQt5.callPackage ../development/tools/tora { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ca73b97bbe57..e0fc57f773b6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2102,6 +2102,8 @@ self: super: with self; { carbon = callPackage ../development/python-modules/carbon { }; + cardano-tools = callPackage ../development/python-modules/cardano-tools { }; + cardimpose = callPackage ../development/python-modules/cardimpose { }; cart = callPackage ../development/python-modules/cart { }; @@ -9732,6 +9734,8 @@ self: super: with self; { oemthermostat = callPackage ../development/python-modules/oemthermostat { }; + ogmios = callPackage ../development/python-modules/ogmios { }; + okonomiyaki = callPackage ../development/python-modules/okonomiyaki { }; okta = callPackage ../development/python-modules/okta { };