Merge master into staging-next
This commit is contained in:
commit
1e3b05e37f
@ -715,10 +715,10 @@ rec {
|
|||||||
getName pkgs.youtube-dl
|
getName pkgs.youtube-dl
|
||||||
=> "youtube-dl"
|
=> "youtube-dl"
|
||||||
*/
|
*/
|
||||||
getName = x:
|
getName = let
|
||||||
let
|
|
||||||
parse = drv: (parseDrvName drv).name;
|
parse = drv: (parseDrvName drv).name;
|
||||||
in if isString x
|
in x:
|
||||||
|
if isString x
|
||||||
then parse x
|
then parse x
|
||||||
else x.pname or (parse x.name);
|
else x.pname or (parse x.name);
|
||||||
|
|
||||||
@ -732,10 +732,10 @@ rec {
|
|||||||
getVersion pkgs.youtube-dl
|
getVersion pkgs.youtube-dl
|
||||||
=> "2016.01.01"
|
=> "2016.01.01"
|
||||||
*/
|
*/
|
||||||
getVersion = x:
|
getVersion = let
|
||||||
let
|
|
||||||
parse = drv: (parseDrvName drv).version;
|
parse = drv: (parseDrvName drv).version;
|
||||||
in if isString x
|
in x:
|
||||||
|
if isString x
|
||||||
then parse x
|
then parse x
|
||||||
else x.version or (parse x.name);
|
else x.version or (parse x.name);
|
||||||
|
|
||||||
|
@ -6,13 +6,13 @@
|
|||||||
buildKodiBinaryAddon rec {
|
buildKodiBinaryAddon rec {
|
||||||
pname = "pvr-iptvsimple";
|
pname = "pvr-iptvsimple";
|
||||||
namespace = "pvr.iptvsimple";
|
namespace = "pvr.iptvsimple";
|
||||||
version = "20.11.1";
|
version = "20.13.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kodi-pvr";
|
owner = "kodi-pvr";
|
||||||
repo = "pvr.iptvsimple";
|
repo = "pvr.iptvsimple";
|
||||||
rev = "${version}-${rel}";
|
rev = "${version}-${rel}";
|
||||||
sha256 = "sha256-Dvnuy+2xW9hPjPVqN7X057B/1zWqIPbkS90kjexJvio=";
|
sha256 = "sha256-W/tFM/WpWdSvLEf0iwQoH2JVDjyfr1l8CRQkOG5q4hk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
extraBuildInputs = [
|
extraBuildInputs = [
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, cmake
|
, cmake
|
||||||
, opencv
|
, opencv
|
||||||
@ -35,6 +36,19 @@ stdenv.mkDerivation rec {
|
|||||||
hash = "sha256-1xb8O3VrErldid2OgAUMG28mSUO7QBUsPuSz8p03tSI";
|
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 ];
|
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook wrapGAppsHook ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
## Required
|
## Required
|
||||||
|
@ -1,24 +1,26 @@
|
|||||||
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, eigen, suitesparse, blas
|
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, eigen, suitesparse, blas
|
||||||
, lapack, libGLU, qtbase, libqglviewer, makeWrapper }:
|
, lapack, libGLU, qtbase, libqglviewer, spdlog }:
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "g2o";
|
pname = "g2o";
|
||||||
version = "20230223";
|
version = "20230806";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "RainerKuemmerle";
|
owner = "RainerKuemmerle";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "${version}_git";
|
rev = "${version}_git";
|
||||||
sha256 = "sha256-J2Z3oRkyiinIfywBQvnq1Q8Z5WuzQXOVTZTwN8oivf0=";
|
hash = "sha256-9u1FFRWe7qvDhzSKdGTduuGBXmmgzcSriGFb/oCJjNA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Removes a reference to gcc that is only used in a debug message
|
# Removes a reference to gcc that is only used in a debug message
|
||||||
patches = [ ./remove-compiler-reference.patch ];
|
patches = [ ./remove-compiler-reference.patch ];
|
||||||
|
|
||||||
|
outputs = [ "out" "dev" ];
|
||||||
separateDebugInfo = true;
|
separateDebugInfo = true;
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake makeWrapper ];
|
nativeBuildInputs = [ cmake ];
|
||||||
buildInputs = [ eigen suitesparse blas lapack libGLU qtbase libqglviewer ];
|
buildInputs = [ eigen suitesparse blas lapack libGLU qtbase libqglviewer ];
|
||||||
|
propagatedBuildInputs = [ spdlog ];
|
||||||
|
|
||||||
dontWrapQtApps = true;
|
dontWrapQtApps = true;
|
||||||
|
|
||||||
|
@ -9,8 +9,6 @@ buildDunePackage {
|
|||||||
src
|
src
|
||||||
;
|
;
|
||||||
|
|
||||||
duneVersion = "3";
|
|
||||||
|
|
||||||
buildInputs = [ ppx_sexp_conv ppx_here ];
|
buildInputs = [ ppx_sexp_conv ppx_here ];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -5,14 +5,13 @@
|
|||||||
|
|
||||||
buildDunePackage rec {
|
buildDunePackage rec {
|
||||||
pname = "conduit";
|
pname = "conduit";
|
||||||
version = "6.2.0";
|
version = "6.2.1";
|
||||||
|
|
||||||
minimalOCamlVersion = "4.08";
|
minimalOCamlVersion = "4.08";
|
||||||
duneVersion = "3";
|
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz";
|
url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz";
|
||||||
sha256 = "sha256-PtRAsO3aGyEt12K9skgx85TcoFmF3RtKxPlFgdFFI5Q=";
|
hash = "sha256-WdXntiQ3vkibC3nOEf+QrATvOcaD5M78qFh6/cL1W7s=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ppx_sexp_conv ];
|
propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ppx_sexp_conv ];
|
||||||
|
@ -6,7 +6,6 @@
|
|||||||
buildDunePackage {
|
buildDunePackage {
|
||||||
pname = "conduit-lwt-unix";
|
pname = "conduit-lwt-unix";
|
||||||
inherit (conduit-lwt) version src;
|
inherit (conduit-lwt) version src;
|
||||||
duneVersion = "3";
|
|
||||||
|
|
||||||
buildInputs = [ ppx_sexp_conv ];
|
buildInputs = [ ppx_sexp_conv ];
|
||||||
|
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
buildDunePackage {
|
buildDunePackage {
|
||||||
pname = "conduit-lwt";
|
pname = "conduit-lwt";
|
||||||
inherit (conduit) version src;
|
inherit (conduit) version src;
|
||||||
duneVersion = "3";
|
|
||||||
|
|
||||||
buildInputs = [ ppx_sexp_conv ];
|
buildInputs = [ ppx_sexp_conv ];
|
||||||
|
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ buildDunePackage, conduit-lwt
|
{ buildDunePackage, conduit-lwt
|
||||||
, fetchpatch
|
|
||||||
, ppx_sexp_conv, sexplib, uri, cstruct, mirage-flow
|
, ppx_sexp_conv, sexplib, uri, cstruct, mirage-flow
|
||||||
, mirage-flow-combinators, mirage-random, mirage-time, mirage-clock
|
, mirage-flow-combinators, mirage-random, mirage-time, mirage-clock
|
||||||
, dns-client-mirage, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp
|
, dns-client-mirage, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp
|
||||||
@ -11,12 +10,6 @@ buildDunePackage {
|
|||||||
|
|
||||||
inherit (conduit-lwt) version src;
|
inherit (conduit-lwt) version src;
|
||||||
|
|
||||||
# Compatibility with tls ≥ 0.17
|
|
||||||
patches = fetchpatch {
|
|
||||||
url = "https://github.com/mirage/ocaml-conduit/commit/403b4cec528dae71aded311215868a35c11dad7e.patch";
|
|
||||||
hash = "sha256-R/iuLf2PSrx8mLKLueMA3+zr9sB8dX/3evjUbfQECBk=";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [ ppx_sexp_conv ];
|
nativeBuildInputs = [ ppx_sexp_conv ];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, buildNpmPackage
|
, buildNpmPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, runCommand
|
||||||
|
, web-ext
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildNpmPackage rec {
|
buildNpmPackage rec {
|
||||||
@ -16,6 +18,13 @@ buildNpmPackage rec {
|
|||||||
|
|
||||||
npmDepsHash = "sha256-KPBKUjCxva11w/E+Qhlx+1vikpCL7Hr9MiKenYHEVSU=";
|
npmDepsHash = "sha256-KPBKUjCxva11w/E+Qhlx+1vikpCL7Hr9MiKenYHEVSU=";
|
||||||
|
|
||||||
|
npmBuildFlags = [ "--production" ];
|
||||||
|
|
||||||
|
passthru.tests.help = runCommand "${pname}-tests" { } ''
|
||||||
|
${web-ext}/bin/web-ext --help
|
||||||
|
touch $out
|
||||||
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "A command line tool to help build, run, and test web extensions";
|
description = "A command line tool to help build, run, and test web extensions";
|
||||||
homepage = "https://github.com/mozilla/web-ext";
|
homepage = "https://github.com/mozilla/web-ext";
|
||||||
|
Loading…
Reference in New Issue
Block a user