diff --git a/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix b/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix index f9c2547d4246..a82fa9068c66 100644 --- a/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix +++ b/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "nvidia-optical-flow-sdk"; - version = "1.0"; + version = "2.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "NVIDIAOpticalFlowSDK"; - rev = "79c6cee80a2df9a196f20afd6b598a9810964c32"; - sha256 = "1y6igwv75v1ynqm7j6la3ky0f15mgnj1jyyak82yvhcsx1aax0a1"; + rev = "edb50da3cf849840d680249aa6dbef248ebce2ca"; + sha256 = "0hv0m0k9wl2wjhhl886j7ymngnf2xz7851nfh57s1gy5bv9lgdgz"; }; # # We only need the header files. The library files are @@ -25,4 +25,3 @@ stdenv.mkDerivation { platforms = platforms.all; }; } - diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 58609a9186d6..a33eff4faa53 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -301,7 +301,7 @@ stdenv.mkDerivation { "-DCUDA_FAST_MATH=ON" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr" - "-DNVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH=${nvidia-optical-flow-sdk}" + "-DNVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH=${nvidia-optical-flow-sdk}" ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" diff --git a/pkgs/development/libraries/opencv/cuda_opt_flow.patch b/pkgs/development/libraries/opencv/cuda_opt_flow.patch index cb96721fb530..2f97abd51bbf 100644 --- a/pkgs/development/libraries/opencv/cuda_opt_flow.patch +++ b/pkgs/development/libraries/opencv/cuda_opt_flow.patch @@ -1,26 +1,27 @@ -diff --git a/opencv_contrib/cudaoptflow/CMakeLists.txt b/opencv_contrib/cudaoptflow/CMakeLists.txt -index e5b823ab4a..a728060d0b 100644 ---- a/opencv_contrib/cudaoptflow/CMakeLists.txt -+++ b/opencv_contrib/cudaoptflow/CMakeLists.txt -@@ -11,18 +11,6 @@ ocv_define_module(cudaoptflow opencv_video opencv_optflow opencv_cudaarithm open - set(NVIDIA_OPTICAL_FLOW_1_0_HEADERS_COMMIT "79c6cee80a2df9a196f20afd6b598a9810964c32") - set(NVIDIA_OPTICAL_FLOW_1_0_HEADERS_MD5 "ca5acedee6cb45d0ec610a6732de5c15") - set(NVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH "${OpenCV_BINARY_DIR}/3rdparty/NVIDIAOpticalFlowSDK_1_0_Headers") --ocv_download(FILENAME "${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_COMMIT}.zip" -- HASH ${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_MD5} -- URL -- "https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/" -- DESTINATION_DIR "${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH}" -- STATUS NVIDIA_OPTICAL_FLOW_1_0_HEADERS_DOWNLOAD_SUCCESS -- ID "NVIDIA_OPTICAL_FLOW" -- UNPACK RELATIVE_URL) - --if(NOT NVIDIA_OPTICAL_FLOW_1_0_HEADERS_DOWNLOAD_SUCCESS) -- message(STATUS "Failed to download NVIDIA_Optical_Flow_1_0 Headers") --else() -- add_definitions(-DHAVE_NVIDIA_OPTFLOW=1) -- ocv_include_directories(SYSTEM "${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_COMMIT}") +diff --unified --recursive --text a/opencv_contrib/cudaoptflow/CMakeLists.txt b/opencv_contrib/cudaoptflow/CMakeLists.txt +--- a/opencv_contrib/cudaoptflow/CMakeLists.txt 2021-06-12 01:35:47.536395972 +0300 ++++ b/opencv_contrib/cudaoptflow/CMakeLists.txt 2021-06-12 01:36:02.029498597 +0300 +@@ -12,19 +12,6 @@ + set(NVIDIA_OPTICAL_FLOW_2_0_HEADERS_COMMIT "edb50da3cf849840d680249aa6dbef248ebce2ca") + set(NVIDIA_OPTICAL_FLOW_2_0_HEADERS_MD5 "a73cd48b18dcc0cc8933b30796074191") + set(NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH "${OpenCV_BINARY_DIR}/3rdparty/NVIDIAOpticalFlowSDK_2_0_Headers") +- ocv_download(FILENAME "${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_COMMIT}.zip" +- HASH ${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_MD5} +- URL "https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/" +- DESTINATION_DIR "${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH}" +- STATUS NVIDIA_OPTICAL_FLOW_2_0_HEADERS_DOWNLOAD_SUCCESS +- ID "NVIDIA_OPTICAL_FLOW" +- UNPACK RELATIVE_URL) +- +- if(NOT NVIDIA_OPTICAL_FLOW_2_0_HEADERS_DOWNLOAD_SUCCESS) +- message(STATUS "Failed to download NVIDIA_Optical_Flow_2_0 Headers") +- else() +- message(STATUS "Building with NVIDIA Optical Flow API 2.0") +- add_definitions(-DHAVE_NVIDIA_OPTFLOW=2) +- ocv_include_directories(SYSTEM "${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_COMMIT}") +- endif() -endif() \ No newline at end of file -+add_definitions(-DHAVE_NVIDIA_OPTFLOW=1) -+ocv_include_directories(SYSTEM "${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH}") ++ add_definitions(-DHAVE_NVIDIA_OPTFLOW=2) ++ ocv_include_directories(SYSTEM "${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH}") ++endif() diff --git a/pkgs/development/libraries/orocos-kdl/default.nix b/pkgs/development/libraries/orocos-kdl/default.nix index 094ee544649d..032b67e683dc 100644 --- a/pkgs/development/libraries/orocos-kdl/default.nix +++ b/pkgs/development/libraries/orocos-kdl/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { pname = "orocos-kdl"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "orocos"; repo = "orocos_kinematics_dynamics"; rev = "v${version}"; - sha256 = "0qj56j231h0rnjbglakammxn2lwmhy5f2qa37v1f6pcn81dn13vv"; + sha256 = "181w2q6lsrfcvrgqwi6m0xrydjlblj1b654apf2d7zjc7qqgd6ca"; + # Needed to build Python bindings + fetchSubmodules = true; }; sourceRoot = "source/orocos_kdl"; diff --git a/pkgs/development/ocaml-modules/mccs/default.nix b/pkgs/development/ocaml-modules/mccs/default.nix new file mode 100644 index 000000000000..3b396215e575 --- /dev/null +++ b/pkgs/development/ocaml-modules/mccs/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchFromGitHub, buildDunePackage, cudf }: + +buildDunePackage rec { + pname = "mccs"; + version = "1.1+13"; + + src = fetchFromGitHub { + owner = "AltGr"; + repo = "ocaml-mccs"; + rev = version; + sha256 = "sha256-K249E9qkWNK4BC+ynaR3bVEyu9Tk8iCE7GptKk/aVJc="; + }; + + useDune2 = true; + + buildInputs = [ + cudf + ]; + + doCheck = true; + + meta = with lib; { + description = "A library providing a multi criteria CUDF solver, part of MANCOOSI project."; + downloadPage = "https://github.com/AltGr/ocaml-mccs"; + homepage = "https://www.i3s.unice.fr/~cpjm/misc/"; + license = with licenses; [ lgpl21 gpl3 ]; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/pkgs/development/python-modules/aprslib/default.nix b/pkgs/development/python-modules/aprslib/default.nix new file mode 100644 index 000000000000..c5f4fa75a572 --- /dev/null +++ b/pkgs/development/python-modules/aprslib/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mox3 +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aprslib"; + version = "0.6.47"; + + src = fetchFromGitHub { + owner = "rossengeorgiev"; + repo = "aprs-python"; + rev = "v${version}"; + sha256 = "1569v74ym2r8vxx3dnjcs5fr7rdrfb0i9sycny5frw2zgms4ag6b"; + }; + + checkInputs = [ + mox3 + pytestCheckHook + ]; + + pythonImportsCheck = [ "aprslib" ]; + + meta = with lib; { + description = "Module for accessing APRS-IS and parsing APRS packets"; + homepage = "https://github.com/rossengeorgiev/aprs-python"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pykdl/default.nix b/pkgs/development/python-modules/pykdl/default.nix index 9a0431b2b859..0d7e82be63f3 100644 --- a/pkgs/development/python-modules/pykdl/default.nix +++ b/pkgs/development/python-modules/pykdl/default.nix @@ -1,24 +1,20 @@ -{ lib, stdenv, toPythonModule, fetchpatch, cmake, orocos-kdl, python, sip_4 }: +{ lib, stdenv, toPythonModule, cmake, orocos-kdl, eigen, python }: toPythonModule (stdenv.mkDerivation { pname = "pykdl"; inherit (orocos-kdl) version src; - patches = [ - # Fix build with SIP 4.19.23+. Can be removed with version 1.5. - # https://github.com/orocos/orocos_kinematics_dynamics/pull/270 - (fetchpatch { - url = "https://github.com/orocos/orocos_kinematics_dynamics/commit/d8d087ad0e1c41f3489d1a255ebfa27b5695196b.patch"; - sha256 = "0qyskqxv4a982kidzzyh34xj2iiw791ipbbl29jg4qb4l21xwqlg"; - stripLen = 1; - }) - ]; - sourceRoot = "source/python_orocos_kdl"; + # Fix hardcoded installation path + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace dist-packages site-packages + ''; + nativeBuildInputs = [ cmake ]; - buildInputs = [ orocos-kdl ]; - propagatedBuildInputs = [ python sip_4 ]; + buildInputs = [ orocos-kdl eigen ]; + propagatedBuildInputs = [ python ]; meta = with lib; { description = "Kinematics and Dynamics Library (Python bindings)"; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index df4c462350c3..793d869be589 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -42,7 +42,7 @@ "apns" = ps: with ps; [ ]; # missing inputs: apns2 "apple_tv" = ps: with ps; [ aiohttp-cors ifaddr netdisco pyatv zeroconf ]; "apprise" = ps: with ps; [ apprise ]; - "aprs" = ps: with ps; [ geopy ]; # missing inputs: aprslib + "aprs" = ps: with ps; [ aprslib geopy ]; "aqualogic" = ps: with ps; [ aqualogic ]; "aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc "arcam_fmj" = ps: with ps; [ ]; # missing inputs: arcam-fmj diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index a6deea717568..df6b475cf65e 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -292,6 +292,7 @@ in with py.pkgs; buildPythonApplication rec { "api" "apple_tv" "apprise" + "aprs" "arlo" "asuswrt" "august" diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 4ba42cbce570..f7bd02d8af53 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -131,6 +131,7 @@ let in if sha512 == "" then # hash stripped from pkgs.nix to save space -> fetch&unpack in a single step + # currently unused as we prefer to keep the sha512 hashes for reproducibility fetchurl { inherit urls; sha1 = if fixedHash == null then throw "TeX Live package ${tlName} is missing hash!" @@ -144,8 +145,7 @@ let // passthru else runCommand "texlive-${tlName}" - ( { # lots of derivations, not meant to be cached - preferLocalBuild = true; allowSubstitutes = false; + ( { inherit passthru; } // lib.optionalAttrs (fixedHash != null) { outputHash = fixedHash; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4bc9a592b672..bdb16cba2a78 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -645,6 +645,8 @@ let markup = callPackage ../development/ocaml-modules/markup { }; + mccs = callPackage ../development/ocaml-modules/mccs { }; + mdx = callPackage ../development/ocaml-modules/mdx { }; menhir = callPackage ../development/ocaml-modules/menhir { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 20e9481450be..aa261fb84b63 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -477,6 +477,8 @@ in { apptools = callPackage ../development/python-modules/apptools { }; + aprslib = callPackage ../development/python-modules/aprslib { }; + APScheduler = callPackage ../development/python-modules/APScheduler { }; apsw = callPackage ../development/python-modules/apsw { };