Unverified Commit 0295c671 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 2f9e98cc b01852a1

pkgs/applications/video/kodi/addons/pvr-vdr-vnsi/default.nix

0 → 100644
+23 −0
Original line number Diff line number Diff line 
{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libGL }:

buildKodiBinaryAddon rec {

  pname = "pvr-vdr-vnsi";

  namespace = "pvr.vdr.vnsi";

  version = "20.4.1";



  src = fetchFromGitHub {

    owner = "kodi-pvr";

    repo = "pvr.vdr.vnsi";

    rev = "${version}-${rel}";

    sha256 = "sha256-QooWK+LwlN5RAISjAQ2YiyDAjQQMzod8fFXpI0ll+hc=";

  };



  extraBuildInputs = [ libGL ];



  meta = with lib; {

    homepage = "https://github.com/kodi-pvr/pvr.vdr.vnsi";

    description = "Kodi's VDR VNSI PVR client addon";

    platforms = platforms.all;

    license = licenses.gpl2Only;

    maintainers = teams.kodi.members;

  };

}

pkgs/development/libraries/readline/8.2.nix

+41 −8
Original line number Diff line number Diff line 
{ fetchurl, stdenv, lib, ncurses

{ lib, stdenv

, fetchpatch, fetchurl

, ncurses, termcap

, curses-library ?

    if stdenv.hostPlatform.isWindows

    then termcap

    else ncurses

}:



stdenv.mkDerivation rec {
@@ -13,7 +19,7 @@ stdenv.mkDerivation rec { 
  outputs = [ "out" "dev" "man" "doc" "info" ];



  strictDeps = true;

  propagatedBuildInputs = [ ncurses ];

  propagatedBuildInputs = [ curses-library ];



  patchFlags = [ "-p0" ];
@@ -27,11 +33,38 @@ stdenv.mkDerivation rec { 
     in

       import ./readline-8.2-patches.nix patch);



  patches =

    [ ./link-against-ncurses.patch

  patches = lib.optionals (curses-library.pname == "ncurses") [

    ./link-against-ncurses.patch

  ] ++ [

    ./no-arch_only-8.2.patch

  ]

    ++ upstreamPatches;

  ++ upstreamPatches

  ++ lib.optionals stdenv.hostPlatform.isWindows [

    (fetchpatch {

      name = "0001-sigwinch.patch";

      url = "https://github.com/msys2/MINGW-packages/raw/90e7536e3b9c3af55c336d929cfcc32468b2f135/mingw-w64-readline/0001-sigwinch.patch";

      stripLen = 1;

      hash = "sha256-sFK6EJrSNl0KLWqFv5zBXaQRuiQoYIZVoZfa8BZqfKA=";

    })

    (fetchpatch {

      name = "0002-event-hook.patch";

      url = "https://github.com/msys2/MINGW-packages/raw/3476319d2751a676b911f3de9e1ec675081c03b8/mingw-w64-readline/0002-event-hook.patch";

      stripLen = 1;

      hash = "sha256-F8ytYuIjBtH83ZCJdf622qjwSw+wZEVyu53E/mPsoAo=";

    })

    (fetchpatch {

      name = "0003-fd_set.patch";

      url = "https://github.com/msys2/MINGW-packages/raw/35830ab27e5ed35c2a8d486961ab607109f5af50/mingw-w64-readline/0003-fd_set.patch";

      stripLen = 1;

      hash = "sha256-UiaXZRPjKecpSaflBMCphI2kqOlcz1JkymlCrtpMng4=";

    })

    (fetchpatch {

      name = "0004-locale.patch";

      url = "https://github.com/msys2/MINGW-packages/raw/f768c4b74708bb397a77e3374cc1e9e6ef647f20/mingw-w64-readline/0004-locale.patch";

      stripLen = 1;

      hash = "sha256-dk4343KP4EWXdRRCs8GRQlBgJFgu1rd79RfjwFD/nJc=";

    })

  ];



  meta = with lib; {

    description = "Library for interactive line editing";
@@ -57,7 +90,7 @@ stdenv.mkDerivation rec { 


    maintainers = with maintainers; [ dtzWill ];



    platforms = platforms.unix;

    platforms = platforms.unix ++ platforms.windows;

    branch = "8.2";

  };

}

pkgs/development/python-modules/bsuite/default.nix

+9 −1
Original line number Diff line number Diff line 
{ lib

, fetchPypi

, buildPythonPackage

, fetchpatch

, frozendict

, termcolor

, matplotlib
@@ -35,7 +36,14 @@ let bsuite = buildPythonPackage rec { 
    hash = "sha256-ak9McvXl7Nz5toUaPaRaJek9lurxiQiIW209GnZEjX0=";

  };



  buildInputs = [

  patches = [

    (fetchpatch {  # Convert np.int -> np.int32 since np.int is deprecated (https://github.com/google-deepmind/bsuite/pull/48)

      url = "https://github.com/google-deepmind/bsuite/pull/48/commits/f8d81b2f1c27ef2c8c71ae286001ed879ea306ab.patch";

      hash = "sha256-FXtvVS+U8brulq8Z27+yWIimB+kigGiUOIv1SHb1TA8=";

    })

  ];



  propagatedBuildInputs = [

    absl-py

    dm-env

    dm-tree

pkgs/development/python-modules/distrax/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
, numpy

, tensorflow-probability

, dm-haiku

, pytest-xdist

, pytestCheckHook

}:
@@ -33,6 +34,7 @@ buildPythonPackage rec { 


  nativeCheckInputs = [

    dm-haiku

    pytest-xdist

    pytestCheckHook

  ];

pkgs/development/python-modules/dm-haiku/default.nix

+73 −28
Original line number Diff line number Diff line 
{ buildPythonPackage

{ lib

, buildPythonPackage

, fetchFromGitHub

, fetchpatch

, callPackage

, lib

, absl-py

, flax

, jaxlib

, jmp

, numpy

, tabulate

, jaxlib

, pytest-xdist

, pytestCheckHook

, bsuite

, chex

, cloudpickle

, dill

, dm-env

, dm-tree

, optax

, rlax

, tensorflow

}:



buildPythonPackage rec {

let dm-haiku = buildPythonPackage rec {

  pname = "dm-haiku";

  version = "0.0.10";

  version = "0.0.11";

  format = "setuptools";



  src = fetchFromGitHub {

    owner = "deepmind";

    repo = pname;

    repo = "dm-haiku";

    rev = "refs/tags/v${version}";

    hash = "sha256-EZx3o6PgTeFjTwI9Ko9H39EqPSE0yLWWpsdqX6ALlo4=";

    hash = "sha256-xve1vNsVOC6/HVtzmzswM/Sk3uUNaTtqNAKheFb/tmI=";

  };



  patches = [

    # https://github.com/deepmind/dm-haiku/issues/717

    (fetchpatch {

      name = "remove-typing-extensions.patch";

      url = "https://github.com/deepmind/dm-haiku/commit/c22867db1a3314a382bd2ce36511e2b756dc32a8.patch";

      hash = "sha256-SxJc8FrImwMqTJ5OuJ1f4T+HfHgW/sGqXeIqlxEatlE=";

    })

    # https://github.com/deepmind/dm-haiku/pull/672

    (fetchpatch {

      name = "fix-find-namespace-packages.patch";
@@ -35,14 +42,12 @@ buildPythonPackage rec { 
    })

  ];



  outputs = [

    "out"

    "testsout"

  ];



  propagatedBuildInputs = [

    absl-py

    flax

    jaxlib

    jmp

    numpy

    tabulate

  ];
@@ -50,17 +55,56 @@ buildPythonPackage rec { 
    "haiku"

  ];



  postInstall = ''

    mkdir $testsout

    cp -R examples $testsout/examples

  '';

  nativeCheckInputs = [

    bsuite

    chex

    cloudpickle

    dill

    dm-env

    dm-haiku

    dm-tree

    jaxlib

    optax

    pytest-xdist

    pytestCheckHook

    rlax

    tensorflow

  ];



  disabledTests = [

    # See https://github.com/deepmind/dm-haiku/issues/366.

    "test_jit_Recurrent"



    # Assertion errors

    "testShapeChecking0"

    "testShapeChecking1"



    # This test requires a more recent version of tensorflow. The current one (2.13) is not enough.

    "test_reshape_convert"



    # This test requires JAX support for double precision (64bit), but enabling this causes several

    # other tests to fail.

    # https://jax.readthedocs.io/en/latest/notebooks/Common_Gotchas_in_JAX.html#double-64bit-precision

    "test_doctest_haiku.experimental"

  ];



  disabledTestPaths = [

    # Those tests requires a more recent version of tensorflow. The current one (2.13) is not enough.

    "haiku/_src/integration/jax2tf_test.py"

  ];



  # check in passthru.tests.pytest to escape infinite recursion with bsuite

  doCheck = false;



  passthru.tests = {

    pytest = callPackage ./tests.nix { };

  };

  # check in passthru.tests.pytest to escape infinite recursion with bsuite

  passthru.tests.pytest = dm-haiku.overridePythonAttrs (_: {

    pname = "${pname}-tests";

    doCheck = true;



    # We don't have to install because the only purpose

    # of this passthru test is to, well, test.

    # This fixes having to set `catchConflicts` to false.

    dontInstall = true;

  });



  meta = with lib; {

    description = "Haiku is a simple neural network library for JAX developed by some of the authors of Sonnet.";
@@ -68,4 +112,5 @@ buildPythonPackage rec { 
    license = licenses.asl20;

    maintainers = with maintainers; [ ndl ];

  };

}
 
};

in dm-haiku