diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix deleted file mode 100644 index 3820fdd1e36c..000000000000 --- a/pkgs/development/python-modules/dm-sonnet/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ lib -, fetchFromGitHub -, bazel_0_26 -, buildBazelPackage -, buildPythonPackage -, git -, python -, six -, absl-py -, semantic-version -, contextlib2 -, wrapt -, tensorflow -, tensorflow-probability -, tensorflow-estimator -}: - -let - version = "1.33"; - - # first build all binaries and generate setup.py using bazel - bazel-build = buildBazelPackage { - bazel = bazel_0_26; - - name = "dm-sonnet-bazel-${version}"; - - src = fetchFromGitHub { - owner = "deepmind"; - repo = "sonnet"; - rev = "v${version}"; - sha256 = "1nqsja1s8jrkq6v1whgh7smk17313mjr9vs3k5c1m8px4yblzhqc"; - }; - - nativeBuildInputs = [ - git # needed to fetch the bazel deps (protobuf in particular) - ]; - - # see https://github.com/deepmind/sonnet/blob/master/docs/INSTALL.md - bazelTarget = ":install"; - - fetchAttrs = { - sha256 = "09dzxs2v5wpiaxrz7qj257q1fbx0gxwbk0jyx58n81m5kys7yj9k"; - }; - - buildAttrs = { - preBuild = '' - patchShebangs . - ''; - - installPhase = '' - # do not generate a wheel, instead just copy the generated files to $out to be installed by buildPythonPackage - sed -i 's,.*bdist_wheel.*,cp -rL . "$out"; exit 0,' bazel-bin/install - - # the target directory "dist" does not actually matter since we're not generating a wheel - bazel-bin/install dist - ''; - }; - }; - -# now use pip to install the package prepared by bazel -in buildPythonPackage { - pname = "dm-sonnet"; - inherit version; - - src = bazel-build; - - propagatedBuildInputs = [ - six - absl-py - semantic-version - contextlib2 - wrapt - tensorflow - tensorflow-probability - tensorflow-estimator - ]; - - # not sure how to properly run the real test suite -- through bazel? - checkPhase = '' - ${python.interpreter} -c "import sonnet" - ''; - - meta = with lib; { - description = "TensorFlow-based neural network library"; - homepage = "https://sonnet.dev"; - license = licenses.asl20; - maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; - broken = true; # depends on older TensorFlow version than is currently packaged - }; -} diff --git a/pkgs/development/python-modules/graph_nets/default.nix b/pkgs/development/python-modules/graph_nets/default.nix deleted file mode 100644 index 4f7b8c52e9ee..000000000000 --- a/pkgs/development/python-modules/graph_nets/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, tensorflow -, absl-py -, dm-sonnet -, networkx -, numpy -, setuptools -, six -, future -}: - -buildPythonPackage rec { - pname = "graph_nets"; - version = "1.1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "278a040674bef295aaf8bb5b0d1b3f207144dc68f0bcfe3f14912b9b85eb0927"; - }; - - postPatch = '' - # https://github.com/deepmind/graph_nets/issues/63 - sed -i 's/dm-sonnet==1.23/dm-sonnet/' setup.py - ''; - - propagatedBuildInputs = [ - tensorflow - absl-py - dm-sonnet - networkx - numpy - setuptools - six - future - ]; - - meta = with lib; { - description = "Build Graph Nets in Tensorflow"; - homepage = "https://github.com/deepmind/graph_nets"; - license = licenses.asl20; - maintainers = with maintainers; [ timokau ]; - }; -} diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix index 9f2fb8b40f41..91131bc02c63 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix @@ -279,12 +279,7 @@ stdenv'.mkDerivation rec { # fixed-output hashes of the fetch phase need to be spot-checked manually downstream = recurseIntoAttrs ({ inherit bazel-watcher; - } - # dm-sonnet is only packaged for linux - // (lib.optionalAttrs stdenv.isLinux { - # TODO(timokau) dm-sonnet is broken currently - # dm-sonnet-linux = python3.pkgs.dm-sonnet; - })); + }); }; # update the list of workspace dependencies diff --git a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix index 0402fb85f26d..f9bcab19fe02 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix @@ -280,12 +280,7 @@ stdenv'.mkDerivation rec { # fixed-output hashes of the fetch phase need to be spot-checked manually downstream = recurseIntoAttrs ({ inherit bazel-watcher; - } - # dm-sonnet is only packaged for linux - // (lib.optionalAttrs stdenv.isLinux { - # TODO(timokau) dm-sonnet is broken currently - # dm-sonnet-linux = python3.pkgs.dm-sonnet; - })); + }); }; # update the list of workspace dependencies diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index c5f61e7d25c3..69a61a718860 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -303,12 +303,7 @@ stdenv.mkDerivation rec { # fixed-output hashes of the fetch phase need to be spot-checked manually downstream = recurseIntoAttrs ({ inherit bazel-watcher; - } - # dm-sonnet is only packaged for linux - // (lib.optionalAttrs stdenv.isLinux { - # TODO(timokau) dm-sonnet is broken currently - # dm-sonnet-linux = python3.pkgs.dm-sonnet; - })); + }); }; # update the list of workspace dependencies diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 79bb378534bd..03006fe6fbee 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -338,12 +338,7 @@ stdenv.mkDerivation rec { # fixed-output hashes of the fetch phase need to be spot-checked manually downstream = recurseIntoAttrs ({ inherit bazel-watcher; - } - # dm-sonnet is only packaged for linux - // (lib.optionalAttrs stdenv.isLinux { - # TODO(timokau) dm-sonnet is broken currently - # dm-sonnet-linux = python3.pkgs.dm-sonnet; - })); + }); }; src_for_updater = stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index 60e708bb47c8..253fe8a67dd1 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -300,12 +300,7 @@ stdenv.mkDerivation rec { # fixed-output hashes of the fetch phase need to be spot-checked manually downstream = recurseIntoAttrs ({ inherit bazel-watcher; - } - # dm-sonnet is only packaged for linux - // (lib.optionalAttrs stdenv.isLinux { - # TODO(timokau) dm-sonnet is broken currently - # dm-sonnet-linux = python3.pkgs.dm-sonnet; - })); + }); }; src_for_updater = stdenv.mkDerivation rec { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a477ed893645..376c9f42f10e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2408,8 +2408,6 @@ in { dm-haiku = callPackage ../development/python-modules/dm-haiku { }; - dm-sonnet = callPackage ../development/python-modules/dm-sonnet { }; - dm-tree = callPackage ../development/python-modules/dm-tree { abseil-cpp = pkgs.abseil-cpp.override { cxxStandard = "14"; @@ -3586,8 +3584,6 @@ in { graphite-web = callPackage ../development/python-modules/graphite-web { }; - graph_nets = callPackage ../development/python-modules/graph_nets { }; - graphene = callPackage ../development/python-modules/graphene { }; graphene-django = callPackage ../development/python-modules/graphene-django { };