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

Merge staging-next into staging

parents 2b4c2235 1e3b05e3

lib/strings.nix

+12 −12
Original line number Diff line number Diff line
@@ -715,10 +715,10 @@ rec { 
       getName pkgs.youtube-dl

       => "youtube-dl"

  */

  getName = x:

   let

  getName = let

    parse = drv: (parseDrvName drv).name;

   in if isString x

  in x:

    if isString x

    then parse x

    else x.pname or (parse x.name);
@@ -732,10 +732,10 @@ rec { 
       getVersion pkgs.youtube-dl

       => "2016.01.01"

  */

  getVersion = x:

   let

  getVersion = let

    parse = drv: (parseDrvName drv).version;

   in if isString x

  in x:

    if isString x

    then parse x

    else x.version or (parse x.name);

pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ 
buildKodiBinaryAddon rec {

  pname = "pvr-iptvsimple";

  namespace = "pvr.iptvsimple";

  version = "20.11.1";

  version = "20.13.0";



  src = fetchFromGitHub {

    owner = "kodi-pvr";

    repo = "pvr.iptvsimple";

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

    sha256 = "sha256-Dvnuy+2xW9hPjPVqN7X057B/1zWqIPbkS90kjexJvio=";

    sha256 = "sha256-W/tFM/WpWdSvLEf0iwQoH2JVDjyfr1l8CRQkOG5q4hk=";

  };



  extraBuildInputs = [

pkgs/applications/video/rtabmap/default.nix

+14 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, fetchpatch

, pkg-config

, cmake

, opencv
@@ -35,6 +36,19 @@ stdenv.mkDerivation rec { 
    hash = "sha256-1xb8O3VrErldid2OgAUMG28mSUO7QBUsPuSz8p03tSI";

  };



  patches = [

    # Fix build with g2o 20230806

    (fetchpatch {

      url = "https://github.com/introlab/rtabmap/commit/85cc6fe3c742855ad16c8442895e12dbb10b6e8b.patch";

      hash = "sha256-P6GkYKCNwe9dgZdgF/oEhgjA3bJnwXFWJCPoyIknQCo=";

    })

    # Fix typo in previous patch

    (fetchpatch {

      url = "https://github.com/introlab/rtabmap/commit/c4e94bcdc31b859c1049724dbb7671e4597d86de.patch";

      hash = "sha256-1btkV4/y+bnF3xEVqlUy/9F6BoANeTOEJjZLmRzG3iA=";

    })

  ];



  nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook wrapGAppsHook ];

  buildInputs = [

    ## Required

pkgs/development/libraries/g2o/default.nix

+6 −4
Original line number Diff line number Diff line 
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, eigen, suitesparse, blas

, lapack, libGLU, qtbase, libqglviewer, makeWrapper }:

, lapack, libGLU, qtbase, libqglviewer, spdlog }:



mkDerivation rec {

  pname = "g2o";

  version = "20230223";

  version = "20230806";



  src = fetchFromGitHub {

    owner = "RainerKuemmerle";

    repo = pname;

    rev = "${version}_git";

    sha256 = "sha256-J2Z3oRkyiinIfywBQvnq1Q8Z5WuzQXOVTZTwN8oivf0=";

    hash = "sha256-9u1FFRWe7qvDhzSKdGTduuGBXmmgzcSriGFb/oCJjNA=";

  };



  # Removes a reference to gcc that is only used in a debug message

  patches = [ ./remove-compiler-reference.patch ];



  outputs = [ "out" "dev" ];

  separateDebugInfo = true;



  nativeBuildInputs = [ cmake makeWrapper ];

  nativeBuildInputs = [ cmake ];

  buildInputs = [ eigen suitesparse blas lapack libGLU qtbase libqglviewer ];

  propagatedBuildInputs = [ spdlog ];



  dontWrapQtApps = true;

pkgs/development/ocaml-modules/conduit/async.nix

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ buildDunePackage { 
    src

    ;



  duneVersion = "3";



  buildInputs = [ ppx_sexp_conv ppx_here ];



  propagatedBuildInputs = [