alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2023-02-06 00:02:27 +00:00 committed by GitHub
parent 5e1e6101ad 8255262d78
commit e628b19818
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 732 additions and 203 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
maintainers/maintainer-list.nix
View file

@ -693,6 +693,15 @@
fingerprint = "7FDB 17B3 C29B 5BA6 E5A9 8BB2 9FAA 63E0 9750 6D9D";
}];
};
Alper-Celik = {
email = "dev.alpercelik@gmail.com";
name = "Alper Çelik";
github = "Alper-Celik";
githubId = 110625473;
keys = [{
fingerprint = "6B69 19DD CEE0 FAF3 5C9F 2984 FA90 C0AB 738A B873";
}];
};
almac = {
email = "alma.cemerlic@gmail.com";
github = "a1mac";

2
nixos/doc/manual/manpages/README.md
View file

@ -4,6 +4,8 @@ This is the collection of NixOS manpages, excluding `configuration.nix(5)`.
Man pages are written in [`mdoc(7)` format](https://mandoc.bsd.lv/man/mdoc.7.html) and should be portable between mandoc and groff for rendering (though minor differences may occur, mandoc and groff seem to have slightly different spacing rules.)
For previewing edited files, you can just run `man -l path/to/file.8` and you will see it rendered.
Being written in `mdoc` these manpages use semantic markup. This file provides a guideline on where to apply which of the semantic elements of `mdoc`.
### Command lines and arguments

4
nixos/modules/services/networking/firefox-syncserver.nix
View file

@ -304,6 +304,10 @@ in
forceSSL = cfg.singleNode.enableTLS;
locations."/" = {
proxyPass = "http://127.0.0.1:${toString cfg.settings.port}";
# We need to pass the Host header that matches the original Host header. Otherwise,
# Hawk authentication will fail (because it assumes that the client and server see
# the same value of the Host header).
recommendedProxySettings = true;
};
};
};

48
pkgs/applications/misc/iptsd/default.nix
View file

@ -1,37 +1,67 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, systemd, inih }:
{ lib
, stdenv
, fetchFromGitHub
, cmake
, meson
, ninja
, pkg-config
, cli11
, hidrd
, inih
, microsoft_gsl
, spdlog
, systemd
}:
stdenv.mkDerivation rec {
pname = "iptsd";
version = "0.5.1";
version = "1.0.0";
src = fetchFromGitHub {
owner = "linux-surface";
repo = pname;
rev = "v${version}";
sha256 = "sha256-du5TC3I5+hWifjdnaeTj2QPJ6/oTXZqaOrZJkef/USU=";
hash = "sha256-fd/WZXRvJb6XCATNmPj2xi1UseoZqBT9IN21iwxHGLs=";
};
nativeBuildInputs = [ meson ninja pkg-config ];
nativeBuildInputs = [
cmake
meson
ninja
pkg-config
];
buildInputs = [ systemd inih ];
dontUseCmakeConfigure = true;
buildInputs = [
cli11
hidrd
inih
microsoft_gsl
spdlog
systemd
];
# Original installs udev rules and service config into global paths
postPatch = ''
substituteInPlace meson.build \
substituteInPlace etc/meson.build \
--replace "install_dir: unitdir" "install_dir: datadir" \
--replace "install_dir: rulesdir" "install_dir: datadir" \
'';
mesonFlags = [
"-Dservice_manager=systemd"
"-Dsample_config=false"
"-Ddebug_tool=false"
"-Ddebug_tools="
"-Db_lto=false" # plugin needed to handle lto object -> undefined reference to ...
];
meta = with lib; {
changelog = "https://github.com/linux-surface/iptsd/releases/tag/${src.rev}";
description = "Userspace daemon for Intel Precise Touch & Stylus";
homepage = "https://github.com/linux-surface/iptsd";
license = licenses.gpl2Only;
maintainers = with maintainers; [ tomberek ];
license = licenses.gpl2Plus;
maintainers = with maintainers; [ tomberek dotlambda ];
platforms = platforms.linux;
};
}

27
pkgs/applications/misc/kanboard/default.nix
View file

@ -1,27 +0,0 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "kanboard";
version = "1.2.26";
src = fetchFromGitHub {
owner = "kanboard";
repo = "kanboard";
rev = "v${version}";
sha256 = "sha256-/Unxl9Vh9pEWjO89sSviGGPFzUwxdb1mbOfpTFTyRL0=";
};
dontBuild = true;
installPhase = ''
mkdir -p $out/share/kanboard
cp -rv . $out/share/kanboard
'';
meta = with lib; {
description = "Kanban project management software";
homepage = "https://kanboard.org";
license = licenses.mit;
maintainers = with maintainers; [ lheckemann ];
};
}

16
pkgs/applications/networking/ids/zeek/avoid-broken-tests.patch Normal file
View file

@ -0,0 +1,16 @@
diff --git a/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt b/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt
index bafbabf1..0579f20a 100644
--- a/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt
+++ b/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt
@@ -188,11 +188,3 @@ install_headers(include hilti)
install_headers(${PROJECT_BINARY_DIR}/include/hilti hilti)
install(CODE "file(REMOVE \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_INCLUDEDIR}/hilti/hilti\")"
)# Get rid of symlink.
-
-##### Tests
-
-add_executable(hilti-toolchain-tests tests/main.cc tests/id-base.cc tests/visitor.cc tests/util.cc)
-hilti_link_executable_in_tree(hilti-toolchain-tests PRIVATE)
-target_link_libraries(hilti-toolchain-tests PRIVATE doctest)
-target_compile_options(hilti-toolchain-tests PRIVATE "-Wall")
-add_test(NAME hilti-toolchain-tests COMMAND ${PROJECT_BINARY_DIR}/bin/hilti-toolchain-tests)

75
pkgs/applications/networking/ids/zeek/broker/0001-Fix-include-path-in-exported-CMake-targets.patch Normal file
View file

@ -0,0 +1,75 @@
From 889ee4dd9e778511e2fb850e6467f55a331cded9 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Sun, 13 Nov 2022 19:06:00 +0100
Subject: [PATCH] Fix include path in exported CMake targets
---
CMakeLists.txt | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e22b77aa..77a15314 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -209,7 +209,6 @@ if (CAF_ROOT)
else()
find_package(CAF REQUIRED COMPONENTS openssl test io core net)
endif()
- list(APPEND LINK_LIBS CAF::core CAF::io CAF::net)
set(BROKER_USE_EXTERNAL_CAF ON)
else ()
message(STATUS "Using bundled CAF")
@@ -243,22 +242,18 @@ endif ()
# Make sure there are no old header versions on disk.
install(
- CODE "MESSAGE(STATUS \"Removing: ${CMAKE_INSTALL_PREFIX}/include/broker\")"
- CODE "file(REMOVE_RECURSE \"${CMAKE_INSTALL_PREFIX}/include/broker\")")
+ CODE "MESSAGE(STATUS \"Removing: ${CMAKE_FULL_INSTALL_INCLUDEDIR}/broker\")"
+ CODE "file(REMOVE_RECURSE \"${CMAKE_FULL_INSTALL_INCLUDEDIR}/broker\")")
# Install all headers except the files from broker/internal.
install(DIRECTORY include/broker
- DESTINATION include
+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
FILES_MATCHING PATTERN "*.hh"
PATTERN "include/broker/internal" EXCLUDE)
-include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include)
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.hh.in
${CMAKE_CURRENT_BINARY_DIR}/include/broker/config.hh)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/broker/config.hh DESTINATION include/broker)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/broker/config.hh DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/broker")
if (NOT BROKER_EXTERNAL_SQLITE_TARGET)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty)
@@ -360,6 +355,11 @@ if (ENABLE_SHARED)
OUTPUT_NAME broker)
target_link_libraries(broker PUBLIC ${LINK_LIBS})
target_link_libraries(broker PRIVATE CAF::core CAF::io CAF::net)
+ target_include_directories(
+ broker PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
install(TARGETS broker
EXPORT BrokerTargets
DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -373,6 +373,11 @@ if (ENABLE_STATIC)
endif()
target_link_libraries(broker_static PUBLIC ${LINK_LIBS})
target_link_libraries(broker_static PRIVATE CAF::core CAF::io CAF::net)
+ target_include_directories(
+ broker_static PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
install(TARGETS broker_static
EXPORT BrokerTargets
DESTINATION ${CMAKE_INSTALL_LIBDIR})
--
2.38.1

88
pkgs/applications/networking/ids/zeek/broker/default.nix Normal file
View file

@ -0,0 +1,88 @@
{ stdenv
, lib
, callPackage
, fetchFromGitHub
, cmake
, pkg-config
, python3
, caf
, openssl
}:
let
inherit (stdenv.hostPlatform) isStatic;
src-cmake = fetchFromGitHub {
owner = "zeek";
repo = "cmake";
rev = "0b7a543554622600bc0a42b57a22f291a4fbd86c";
hash = "sha256-kaBOBTpfR3XyuF4PW5NQKca/UhXXxJJcXVsErFU1VYY=";
};
src-3rdparty = fetchFromGitHub {
owner = "zeek";
repo = "zeek-3rdparty";
rev = "eb87829547270eab13c223e6de58b25bc9a0282e";
hash = "sha256-AVaKcRjF5ZiSR8aPSLBzSTeWVwGWW/aSyQJcN0Yhza0=";
};
caf' = caf.overrideAttrs (old: {
version = "unstable-2022-11-17-zeek";
src = fetchFromGitHub {
owner = "zeek";
repo = "actor-framework";
rev = "dbb68b4573736d7aeb69268cc73aa766c998b3dd";
hash = "sha256-RV2mKF3B47h/hDgK/D1UJN/ll2G5rcPkHaLVY1/C/Pg=";
};
checkPhase = ''
runHook preCheck
libcaf_core/caf-core-test
libcaf_io/caf-io-test
libcaf_openssl/caf-openssl-test
libcaf_net/caf-net-test --not-suites='net.*'
runHook postCheck
'';
});
in
stdenv.mkDerivation rec {
pname = "zeek-broker";
version = "2.4.2";
outputs = [ "out" "py" ];
strictDeps = true;
src = fetchFromGitHub {
owner = "zeek";
repo = "broker";
rev = "v${version}";
hash = "sha256-y07fJEVPDGPv5VThE45SwM342VS6LnEtMvazZHadM/k=";
};
postUnpack = ''
rmdir $sourceRoot/cmake $sourceRoot/3rdparty
ln -s ${src-cmake} ''${sourceRoot}/cmake
ln -s ${src-3rdparty} ''${sourceRoot}/3rdparty
# Refuses to build the bindings unless this file is present, but never
# actually uses it.
touch $sourceRoot/bindings/python/3rdparty/pybind11/CMakeLists.txt
'';
patches = [
./0001-Fix-include-path-in-exported-CMake-targets.patch
];
nativeBuildInputs = [ cmake ];
buildInputs = [ openssl python3.pkgs.pybind11 ];
propagatedBuildInputs = [ caf' ];
cmakeFlags = [
"-DCAF_ROOT=${caf'}"
"-DENABLE_STATIC_ONLY:BOOL=${if isStatic then "ON" else "OFF"}"
"-DPY_MOD_INSTALL_DIR=${placeholder "py"}/${python3.sitePackages}/"
];
meta = with lib; {
description = "Zeek's Messaging Library";
homepage = "https://github.com/zeek/broker";
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = with maintainers; [ tobim ];
};
}

26
pkgs/applications/networking/ids/zeek/debug-runtime-undef-fortify-source.patch Normal file
View file

@ -0,0 +1,26 @@
diff --git a/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt b/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt
index f154901c..76563717 100644
--- a/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt
+++ b/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt
@@ -69,7 +69,7 @@ target_compile_definitions(hilti-rt-objects PRIVATE "HILTI_RT_BUILD_TYPE_RELEASE
# Build hilti-rt-debug with debug flags.
string(REPLACE " " ";" cxx_flags_debug ${CMAKE_CXX_FLAGS_DEBUG})
target_compile_options(hilti-rt-debug-objects PRIVATE ${cxx_flags_debug})
-target_compile_options(hilti-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall")
+target_compile_options(hilti-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall;-U_FORTIFY_SOURCE")
target_compile_definitions(hilti-rt-debug-objects PRIVATE "HILTI_RT_BUILD_TYPE_DEBUG")
add_library(hilti-rt-tests-library-dummy1 SHARED src/tests/library-dummy.cc)
diff --git a/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt b/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt
index 20e7d291..9712341f 100644
--- a/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt
+++ b/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt
@@ -48,7 +48,7 @@ target_link_libraries(spicy-rt-objects PUBLIC hilti-rt-objects)
# Build spicy-rt-debug with debug flags.
string(REPLACE " " ";" cxx_flags_debug ${CMAKE_CXX_FLAGS_DEBUG})
target_compile_options(spicy-rt-debug-objects PRIVATE ${cxx_flags_debug})
-target_compile_options(spicy-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall")
+target_compile_options(spicy-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall;-U_FORTIFY_SOURCE")
target_compile_definitions(spicy-rt-debug-objects PRIVATE "HILTI_RT_BUILD_TYPE_DEBUG")
target_link_libraries(spicy-rt-debug-objects PUBLIC hilti-rt-debug-objects)

44
pkgs/applications/networking/ids/zeek/default.nix
View file

@ -1,10 +1,13 @@
{ lib
, stdenv
, callPackage
, fetchurl
, cmake
, flex
, bison
, spicy-parser-generator
, openssl
, libkqueue
, libpcap
, zlib
, file
@ -16,46 +19,69 @@
, gettext
, coreutils
, ncurses
, caf
}:
let
broker = callPackage ./broker { };
in
stdenv.mkDerivation rec {
pname = "zeek";
version = "4.2.2";
version = "5.1.2";
src = fetchurl {
url = "https://download.zeek.org/zeek-${version}.tar.gz";
sha256 = "sha256-9Q3X24uAmnSnLUAklK+gC0Mu8eh81ZE2h/7uIVc8cAw=";
sha256 = "sha256-1DvXUcTbLBm9UjJXuk8DjGEj+lED+s9D+SNnSqA3bwU=";
};
strictDeps = true;
patches = [
./avoid-broken-tests.patch
./debug-runtime-undef-fortify-source.patch
./fix-installation.patch
];
nativeBuildInputs = [
bison
cmake
file
flex
python3
];
buildInputs = [
broker
spicy-parser-generator
curl
gperftools
libkqueue
libmaxminddb
libpcap
ncurses
openssl
python3
swig
zlib
] ++ lib.optionals stdenv.isDarwin [
gettext
];
outputs = [ "out" "lib" "py" ];
postPatch = ''
patchShebangs ./auxil/spicy/spicy/scripts
substituteInPlace auxil/spicy/CMakeLists.txt --replace "hilti-toolchain-tests" ""
substituteInPlace auxil/spicy/spicy/hilti/CMakeLists.txt --replace "hilti-toolchain-tests" ""
'';
cmakeFlags = [
"-DCAF_ROOT=${caf}"
"-DZEEK_PYTHON_DIR=${placeholder "py"}/lib/${python3.libPrefix}/site-packages"
"-DBroker_ROOT=${broker}"
"-DSPICY_ROOT_DIR=${spicy-parser-generator}"
"-DLIBKQUEUE_ROOT_DIR=${libkqueue}"
"-DENABLE_PERFTOOLS=true"
"-DINSTALL_AUX_TOOLS=true"
"-DZEEK_ETC_INSTALL_DIR=/etc/zeek"
"-DZEEK_LOG_DIR=/var/log/zeek"
"-DZEEK_STATE_DIR=/var/lib/zeek"
"-DZEEK_SPOOL_DIR=/var/spool/zeek"
];
postInstall = ''
@ -70,6 +96,10 @@ stdenv.mkDerivation rec {
done
'';
passthru = {
inherit broker;
};
meta = with lib; {
description = "Network analysis framework much different from a typical IDS";
homepage = "https://www.zeek.org";

28
pkgs/applications/networking/ids/zeek/fix-installation.patch Normal file
View file

@ -0,0 +1,28 @@
From f8c42a712db42cfd00fca75be2ce63c3aad2aad1 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Sun, 13 Nov 2022 21:48:36 +0100
Subject: [PATCH] Fix installation
---
CMakeLists.txt | 5 -----
1 file changed, 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 846b65efd..d8b0be169 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,11 +81,6 @@ if ( NOT ZEEK_LOG_DIR )
set(ZEEK_LOG_DIR ${ZEEK_ROOT_DIR}/logs)
endif ()
-install(DIRECTORY DESTINATION ${ZEEK_ETC_INSTALL_DIR})
-install(DIRECTORY DESTINATION ${ZEEK_STATE_DIR})
-install(DIRECTORY DESTINATION ${ZEEK_SPOOL_DIR})
-install(DIRECTORY DESTINATION ${ZEEK_LOG_DIR})
-
configure_file(zeek-path-dev.in ${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev)
execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink
"${CMAKE_CURRENT_BINARY_DIR}/zeek-wrapper.in"
--
2.37.3

2
pkgs/applications/networking/mailreaders/mblaze/default.nix
View file

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "1.2";
nativeBuildInputs = [ installShellFiles makeWrapper ];
buildInputs = [ ruby ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
buildInputs = [ libiconv ruby ];
src = fetchFromGitHub {
owner = "leahneukirchen";

4
pkgs/applications/version-management/tig/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "tig";
version = "2.5.7";
version = "2.5.8";
src = fetchFromGitHub {
owner = "jonas";
repo = pname;
rev = "${pname}-${version}";
sha256 = "sha256-D5NQaxkGhwyBoScI7fZxnSHC0ABmsUeRf8pZCKooV3w=";
sha256 = "sha256-VuuqR5fj0YvqIfVPH7N3rpAfIbcTwOx9W3H60saCToQ=";
};
nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ];

4
pkgs/development/libraries/exempi/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "exempi";
version = "2.6.2";
version = "2.6.3";
src = fetchurl {
url = "https://libopenraw.freedesktop.org/download/${pname}-${version}.tar.bz2";
sha256 = "sha256-TRfUyT3yqV2j4xcsRbelvzF90x2v0cejQBaXKMcInR0=";
sha256 = "sha256-sHSdsYqeeM93FzeVSoOM3NsdVBWIi6wbqcr4y6d8ZWw=";
};
configureFlags = [

11
pkgs/development/libraries/libvmaf/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, nasm }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, nasm }:
stdenv.mkDerivation rec {
pname = "libvmaf";
@ -13,6 +13,15 @@ stdenv.mkDerivation rec {
sourceRoot = "source/libvmaf";
patches = [
# Backport fix for non-Linux, non-Darwin platforms.
(fetchpatch {
url = "https://github.com/Netflix/vmaf/commit/f47640f9ffee9494571bd7c9622e353660c93fc4.patch";
stripLen = 1;
sha256 = "rsTKuqp8VJG5DBDpixPke3LrdfjKzUO945i+iL0n7CY=";
})
];
nativeBuildInputs = [ meson ninja nasm ];
mesonFlags = [ "-Denable_avx512=true" ];

26
pkgs/development/libraries/magic-enum/default.nix Normal file
View file

@ -0,0 +1,26 @@
{ fetchFromGitHub
, lib
, stdenv
, cmake
}:
stdenv.mkDerivation rec{
pname = "magic-enum";
version = "0.8.2";
src = fetchFromGitHub {
owner = "Neargye";
repo = "magic_enum";
rev = "v${version}";
sha256 = "sha256-k4zCEQxO0N/o1hDYxw5p9u0BMwP/5oIoe/4yw7oqEo0=";
};
nativeBuildInputs = [ cmake ];
doCheck = true;
meta = with lib;{
description = "Static reflection for enums (to string, from string, iteration) for modern C++";
homepage = "https://github.com/Neargye/magic_enum";
license = licenses.mit;
maintainers = with maintainers; [ Alper-Celik ];
};
}

31
pkgs/development/libraries/openvino/cmake.patch Normal file
View file

@ -0,0 +1,31 @@
diff --git a/cmake/developer_package/linux_name.cmake b/cmake/developer_package/linux_name.cmake
index 3e8c775770..2d5e00fb8b 100644
--- a/cmake/developer_package/linux_name.cmake
+++ b/cmake/developer_package/linux_name.cmake
@@ -6,25 +6,7 @@ include(target_flags)
if(LINUX)
function(get_linux_name res_var)
- if(EXISTS "/etc/lsb-release")
- # linux version detection using cat /etc/lsb-release
- file(READ "/etc/lsb-release" release_data)
- set(name_regex "DISTRIB_ID=([^ \n]*)\n")
- set(version_regex "DISTRIB_RELEASE=([0-9]+(\\.[0-9]+)?)")
- else()
- execute_process(COMMAND find -L /etc/ -maxdepth 1 -type f -name *-release -exec cat {} \;
- OUTPUT_VARIABLE release_data
- RESULT_VARIABLE result)
- string(REPLACE "Red Hat" "CentOS" release_data "${release_data}")
- set(name_regex "NAME=\"([^ \"\n]*).*\"\n")
- set(version_regex "VERSION=\"([0-9]+(\\.[0-9]+)?)[^\n]*\"")
- endif()
-
- string(REGEX MATCH ${name_regex} name ${release_data})
- set(os_name ${CMAKE_MATCH_1})
-
- string(REGEX MATCH ${version_regex} version ${release_data})
- set(os_name "${os_name} ${CMAKE_MATCH_1}")
+ set(os_name "NixOS @version@")
if(os_name)
set(${res_var} ${os_name} PARENT_SCOPE)

211
pkgs/development/libraries/openvino/default.nix
View file

@ -1,115 +1,167 @@
{ lib
, addOpenGLRunpath
, autoPatchelfHook
, stdenv
, fetchFromGitHub
, fetchpatch
, fetchurl
, substituteAll
# build
, addOpenGLRunpath
, autoPatchelfHook
, cmake
, git
, protobuf
, tbb
, opencv
, unzip
, shellcheck
, srcOnly
, libarchive
, pkg-config
, python
, enablePython ? false
, shellcheck
# runtime
, libusb1
, libxml2
, opencv
, protobuf
, pugixml
, tbb
}:
let
onnx_src = srcOnly {
name = "onnx-patched";
src = fetchFromGitHub {
owner = "onnx";
repo = "onnx";
rev = "v1.8.1";
sha256 = "+1zNnZ4lAyVYRptfk0PV7koIX9FqcfD1Ah33qj/G2rA=";
};
patches = [
# Fix build with protobuf 3.18+
# Remove with onnx 1.9 release
(fetchpatch {
url = "https://github.com/onnx/onnx/commit/d3bc82770474761571f950347560d62a35d519d7.patch";
sha256 = "0vdsrklkzhdjaj8wdsl4icn93q3961g8dx35zvff0nhpr08wjb7y";
})
];
# See FIRMWARE_PACKAGE_VERSION in src/plugins/intel_myriad/myriad_dependencies.cmake
myriad_firmware_version = "20221129_35";
myriad_usb_firmware = fetchurl {
url = "https://storage.openvinotoolkit.org/dependencies/myriad/firmware_usb-ma2x8x_${myriad_firmware_version}.zip";
hash = "sha256-HKNWbSlMjSafOgrS9WmenbsmeaJKRVssw0NhIwPYZ70=";
};
myriad_pcie_firmware = fetchurl {
url = "https://storage.openvinotoolkit.org/dependencies/myriad/firmware_pcie-ma2x8x_${myriad_firmware_version}.zip";
hash = "sha256-VmfrAoKQ++ySIgAxWQul+Hd0p7Y4sTF44Nz4RHpO6Mo=";
};
# See GNA_VERSION in cmake/dependencies.cmake
gna_version = "03.00.00.1910";
gna = fetchurl {
url = "https://storage.openvinotoolkit.org/dependencies/gna/gna_${gna_version}.zip";
hash = "sha256-iU3bwK40WfBFE7hTsMq8MokN1Oo3IooCK2oyEBvbt/g=";
};
tbbbind_version = "2_5";
tbbbind = fetchurl {
url = "https://download.01.org/opencv/master/openvinotoolkit/thirdparty/linux/tbbbind_${tbbbind_version}_static_lin_v2.tgz";
hash = "sha256-hl54lMWEAiM8rw0bKIBW4OarK/fJ0AydxgVhxIS8kPQ=";
};
in
stdenv.mkDerivation rec {
pname = "openvino";
version = "2021.2";
version = "2022.3.0";
src = fetchFromGitHub {
owner = "openvinotoolkit";
repo = "openvino";
rev = version;
sha256 = "pv4WTfY1U5GbA9Yj07UOLQifvVH3oDfWptxxYW5IwVQ=";
rev = "refs/tags/${version}";
fetchSubmodules = true;
hash = "sha256-Ie58zTNatiYZZQJ8kJh/+HlSetQjhAtf2Us83z1jGv4=";
};
outputs = [
"out"
"python"
];
nativeBuildInputs = [
addOpenGLRunpath
autoPatchelfHook
cmake
git
libarchive
pkg-config
(python.withPackages (ps: with ps; [
cython
pybind11
setuptools
]))
shellcheck
];
patches = [
(substituteAll {
src = ./cmake.patch;
inherit (lib) version;
})
];
postPatch = ''
mkdir -p temp/vpu/firmware/{pcie,usb}-ma2x8x
pushd temp/vpu/firmware
bsdtar -xf ${myriad_pcie_firmware} -C pcie-ma2x8x
echo "${myriad_pcie_firmware.url}" > pcie-ma2x8x/ie_dependency.info
bsdtar -xf ${myriad_usb_firmware} -C usb-ma2x8x
echo "${myriad_usb_firmware.url}" > usb-ma2x8x/ie_dependency.info
popd
mkdir -p temp/gna_${gna_version}
pushd temp/
bsdtar -xf ${gna}
autoPatchelf gna_${gna_version}
echo "${gna.url}" > gna_${gna_version}/ie_dependency.info
popd
mkdir -p temp/tbbbind_${tbbbind_version}
pushd temp/tbbbind_${tbbbind_version}
bsdtar -xf ${tbbbind}
echo "${tbbbind.url}" > ie_dependency.info
popd
'';
dontUseCmakeBuildDir = true;
cmakeFlags = [
"-DNGRAPH_USE_SYSTEM_PROTOBUF:BOOL=ON"
"-DFETCHCONTENT_FULLY_DISCONNECTED:BOOL=ON"
"-DFETCHCONTENT_SOURCE_DIR_EXT_ONNX:STRING=${onnx_src}"
"-DENABLE_VPU:BOOL=OFF"
"-DTBB_DIR:STRING=${tbb}"
"-DCMAKE_PREFIX_PATH:PATH=${placeholder "out"}"
"-DCMAKE_MODULE_PATH:PATH=${placeholder "out"}/lib/cmake"
"-DENABLE_LTO:BOOL=ON"
# protobuf
"-DENABLE_SYSTEM_PROTOBUF:BOOL=OFF"
"-DProtobuf_LIBRARIES=${protobuf}/lib/libprotobuf${stdenv.hostPlatform.extensions.sharedLibrary}"
# tbb
"-DENABLE_SYSTEM_TBB:BOOL=ON"
# opencv
"-DENABLE_OPENCV:BOOL=ON"
"-DOPENCV:STRING=${opencv}"
"-DENABLE_GNA:BOOL=OFF"
"-DENABLE_SPEECH_DEMO:BOOL=OFF"
"-DBUILD_TESTING:BOOL=OFF"
"-DENABLE_CLDNN_TESTS:BOOL=OFF"
"-DNGRAPH_INTERPRETER_ENABLE:BOOL=ON"
"-DNGRAPH_TEST_UTIL_ENABLE:BOOL=OFF"
"-DNGRAPH_UNIT_TEST_ENABLE:BOOL=OFF"
"-DENABLE_SAMPLES:BOOL=OFF"
"-DENABLE_CPPLINT:BOOL=OFF"
] ++ lib.optionals enablePython [
"-DOpenCV_DIR=${opencv}/lib/cmake/opencv4/"
# pugixml
"-DENABLE_SYSTEM_PUGIXML:BOOL=ON"
# onednn
"-DENABLE_ONEDNN_FOR_GPU:BOOL=OFF"
# intel gna
"-DENABLE_INTEL_GNA:BOOL=ON"
# python
"-DENABLE_PYTHON:BOOL=ON"
# tests
"-DENABLE_CPPLINT:BOOL=OFF"
"-DBUILD_TESTING:BOOL=OFF"
"-DENABLE_SAMPLES:BOOL=OFF"
];
preConfigure = ''
# To make install openvino inside /lib instead of /python
substituteInPlace inference-engine/ie_bridges/python/CMakeLists.txt \
--replace 'DESTINATION python/''${PYTHON_VERSION}/openvino' 'DESTINATION lib/''${PYTHON_VERSION}/site-packages/openvino' \
--replace 'DESTINATION python/''${PYTHON_VERSION}' 'DESTINATION lib/''${PYTHON_VERSION}/site-packages/openvino'
substituteInPlace inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt \
--replace 'python/''${PYTHON_VERSION}/openvino/inference_engine' 'lib/''${PYTHON_VERSION}/site-packages/openvino/inference_engine'
# Used to download OpenCV based on Linux Distro and make it use system OpenCV
substituteInPlace inference-engine/cmake/dependencies.cmake \
--replace 'include(linux_name)' ' ' \
--replace 'if (ENABLE_OPENCV)' 'if (ENABLE_OPENCV AND NOT DEFINED OPENCV)'
cmakeDir=$PWD
mkdir ../build
cd ../build
'';
autoPatchelfIgnoreMissingDeps = [ "libngraph_backend.so" ];
nativeBuildInputs = [
cmake
autoPatchelfHook
addOpenGLRunpath
unzip
autoPatchelfIgnoreMissingDeps = [
"libngraph_backend.so"
];
buildInputs = [
git
protobuf
libusb1
libxml2
opencv
python
protobuf
pugixml
tbb
shellcheck
] ++ lib.optionals enablePython (with python.pkgs; [
cython
pybind11
]);
];
enableParallelBuilding = true;
postInstall = ''
pushd $out/python/python${lib.versions.majorMinor python.version}
mkdir -p $python
mv ./* $python/
popd
rm -r $out/python
'';
postFixup = ''
# Link to OpenCL
@ -130,8 +182,7 @@ stdenv.mkDerivation rec {
homepage = "https://docs.openvinotoolkit.org/";
license = with licenses; [ asl20 ];
platforms = platforms.all;
broken = (stdenv.isLinux && stdenv.isx86_64) # at 2022-09-23
|| stdenv.isDarwin; # Cannot find macos sdk
broken = stdenv.isDarwin; # Cannot find macos sdk
maintainers = with maintainers; [ tfmoraes ];
};
}

8
pkgs/development/ocaml-modules/ounit2/default.nix
View file

@ -1,22 +1,22 @@
{ lib, ocaml, buildDunePackage, fetchurl, seq, stdlib-shims, ncurses }:
buildDunePackage rec {
minimumOCamlVersion = "4.04";
minimalOCamlVersion = "4.04";
pname = "ounit2";
version = "2.2.6";
useDune2 = lib.versionAtLeast ocaml.version "4.08";
duneVersion = if lib.versionAtLeast ocaml.version "4.08" then "2" else "1";
src = fetchurl {
url = "https://github.com/gildor478/ounit/releases/download/v${version}/ounit-${version}.tbz";
sha256 = "sha256-BpD7Hg6QoY7tXDVms8wYJdmLDox9UbtrhGyVxFphWRM=";
hash = "sha256-BpD7Hg6QoY7tXDVms8wYJdmLDox9UbtrhGyVxFphWRM=";
};
propagatedBuildInputs = [ seq stdlib-shims ];
doCheck = true;
nativeCheckInputs = lib.optional (lib.versionOlder ocaml.version "4.07") ncurses;
checkInputs = lib.optional (lib.versionOlder ocaml.version "4.07") ncurses;
meta = with lib; {
homepage = "https://github.com/gildor478/ounit";

4
pkgs/development/python-modules/azure-core/default.nix
View file

@ -17,7 +17,7 @@
, typing-extensions }:
buildPythonPackage rec {
version = "1.26.1";
version = "1.26.3";
pname = "azure-core";
disabled = pythonOlder "3.6";
@ -26,7 +26,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "sha256-IjsOkMvdHwPEGxlbAyOYmYQ/INAJZNu4XmQ4aHNBSi0=";
sha256 = "sha256-rL0NqpZ1zohiPaNcgNgZza+pFzHe5rJpXGTXyp2oLbQ=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix
View file

@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-datalake-store";
version = "1.0.0";
version = "0.5.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "sha256-GrmVK97M+iojevPLVTuLmfQRLxvrHtr9DRHymJvLYHE=";
sha256 = "sha256-k3bTVJVmHRn4rMVgT2ewvFlJOxg1u8SA+aGVL5ABekw=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-mgmt-msi/default.nix
View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "azure-mgmt-msi";
version = "6.1.0";
version = "7.0.0";
disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "sha256-lS8da3Al1z1pMLDBf6ZtWc1UFUVgkN1qpKTxt4VXdlQ=";
sha256 = "sha256-ctRsmmJ4PsTqthm+nRt4/+u9qhZNQG/TA/FjA/NyVrI=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-servicebus/default.nix
View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "azure-servicebus";
version = "7.8.1";
version = "7.8.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
hash = "sha256-gI5eCyXGFkQgY0rhyGLioLXj1a4I6vV64Nm/EKyFEks=";
hash = "sha256-FC4AUHWV8UxvB1Lz3/+z/l/OhdTj1YSn4iLmXt+zwZo=";
};
propagatedBuildInputs = [

36
pkgs/development/python-modules/azure-storage/default.nix
View file

@ -1,36 +0,0 @@
{ pkgs
, buildPythonPackage
, fetchPypi
, azure-common
, cryptography
, futures ? null
, python-dateutil
, requests
, isPy3k
}:
buildPythonPackage rec {
version = "0.36.0";
pname = "azure-storage";
src = fetchPypi {
inherit pname version;
sha256 = "0pyasfxkin6j8j00qmky7d9cvpxgis4fi9bscgclj6yrpvf14qpv";
};
propagatedBuildInputs = [ azure-common cryptography python-dateutil requests ]
++ pkgs.lib.optionals (!isPy3k) [ futures ];
postPatch = ''
rm azure_bdist_wheel.py
substituteInPlace setup.cfg \
--replace "azure-namespace-package = azure-nspkg" ""
'';
meta = with pkgs.lib; {
description = "Microsoft Azure SDK for Python";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.asl20;
maintainers = with maintainers; [ olcai ];
};
}

3
pkgs/development/python-modules/gensim/default.nix
View file

@ -56,5 +56,8 @@ buildPythonPackage rec {
homepage = "https://radimrehurek.com/gensim/";
license = licenses.lgpl21Only;
maintainers = with maintainers; [ jyp ];
# python310 errors as: No matching distribution found for FuzzyTM>=0.4.0
# python311 errors as: longintrepr.h: No such file or directory
broken = true; # At 2023-02-05
};
}

40
pkgs/development/python-modules/openvino/default.nix Normal file
View file

@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, openvino-native
, numpy
, python
}:
buildPythonPackage {
pname = "openvino";
inherit (openvino-native) version;
format = "other";
src = openvino-native.python;
propagatedBuildInputs = [
numpy
];
installPhase = ''
runHook preInstall
mkdir -p $out/${python.sitePackages}
cp -Rv * $out/${python.sitePackages}/
runHook postInstall
'';
pythonImportsCheck = [
"ngraph"
"openvino"
"openvino.runtime"
];
meta = with lib; {
description = "OpenVINO(TM) Runtime";
homepage = "https://github.com/openvinotoolkit/openvino";
license = licenses.asl20;
maintainers = with maintainers; [ hexa ];
};
}

4
pkgs/development/python-modules/pytradfri/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pytradfri";
version = "12.0.1";
version = "13.0.0";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "pytradfri";
rev = "refs/tags/${version}";
hash = "sha256-ov5Z9frYxdbPxqUedwXPYZEinCgQ0ge1jcX6UFdQMHw=";
hash = "sha256-CWv3ebDulZuiFP+nJ2Xr7U/HTDFTqA9VYC0USLkpWR0=";
};
propagatedBuildInputs = [

9
pkgs/development/python-modules/rflink/default.nix
View file

@ -23,6 +23,15 @@ buildPythonPackage rec {
sha256 = "sha256-BNKcXtsBB90KQe4HXmfJ7H3yepk1dEkozSEy5v8KSAA=";
};
patches = [
# https://github.com/aequitas/python-rflink/pull/70
(fetchpatch {
name = "python311-compat.patch";
url = "https://github.com/aequitas/python-rflink/commit/ba807ddd2fde823b8d50bc50bb500a691d9e331f.patch";
hash = "sha256-4Wh7b7j8qsvzYKdFwaY+B5Jd8EkyjAe1awlY0BDu2YA=";
})
];
propagatedBuildInputs = [
async-timeout
docopt

67
pkgs/development/tools/parsing/spicy/default.nix Normal file
View file

@ -0,0 +1,67 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, makeWrapper
, python3
, bison
, flex
, zlib
}:
stdenv.mkDerivation rec {
pname = "spicy";
version = "1.5.3";
strictDeps = true;
src = fetchFromGitHub {
owner = "zeek";
repo = "spicy";
rev = "v${version}";
hash = "sha256-eCF914QEBBqg3LfM3N22c7W0TMOhuHqLxncpAG+8FjU=";
fetchSubmodules = true;
};
nativeBuildInputs = [
cmake
makeWrapper
python3
];
buildInputs = [
bison
flex
zlib
];
postPatch = ''
patchShebangs scripts tests/scripts
'';
cmakeFlags = [
"-DHILTI_DEV_PRECOMPILE_HEADERS=OFF"
];
preFixup = ''
for b in $out/bin/*
do wrapProgram "$b" --prefix PATH : "${lib.makeBinPath [ bison flex ]}"
done
'';
meta = with lib; {
homepage = "https://github.com/zeek/spicy";
description = "A C++ parser generator for dissecting protocols & files";
longDescription = ''
Spicy is a parser generator that makes it easy to create robust C++
parsers for network protocols, file formats, and more. Spicy is a bit
like a "yacc for protocols", but it's much more than that: It's an
all-in-one system enabling developers to write attributed grammars that
describe both syntax and semantics of an input format using a single,
unified language. Think of Spicy as a domain-specific scripting language
for all your parsing needs.
'';
license = licenses.bsd3;
maintainers = with maintainers; [ tobim ];
};
}

3
pkgs/tools/archivers/arc_unpacker/default.nix
View file

@ -13,8 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake makeWrapper catch2 ];
buildInputs = [ boost libpng libjpeg zlib openssl libwebp ]
++ lib.optionals stdenv.isDarwin [ libiconv ];
buildInputs = [ boost libiconv libjpeg libpng libwebp openssl zlib ];
postPatch = ''
cp ${catch2}/include/catch2/catch.hpp tests/test_support/catch.h

6
pkgs/tools/package-management/nfpm/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "nfpm";
version = "2.24.0";
version = "2.25.0";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ZbKkyRCzfnX8TPBeUYZk2b5M//g1cyiksUMBg0z7nlQ=";
sha256 = "sha256-Mu0/mWkdrhaybI0iAB/MuD7UTbDDC73ZMxr8kU7R23I=";
};
vendorHash = "sha256-TrJtuFzreIjq7fCw/XT1jniw9Ey9k6xmXotby6A651g=";
vendorHash = "sha256-YDV816jTLAqbSjiKXvbkwPbPCLPplH+NFN1SCVjWcbk=";
ldflags = [ "-s" "-w" "-X main.version=${version}" ];

13
pkgs/tools/package-management/xbps/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, which, zlib, openssl, libarchive }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, which, zlib, openssl, libarchive }:
stdenv.mkDerivation rec {
pname = "xbps";
@ -15,9 +15,16 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib openssl libarchive ];
patches = [ ./cert-paths.patch ];
patches = [
./cert-paths.patch
# fix openssl 3
(fetchpatch {
url = "https://github.com/void-linux/xbps/commit/db1766986c4389eb7e17c0e0076971b711617ef9.patch";
hash = "sha256-CmyZdsHStPsELdEgeJBWIbXIuVeBhv7VYb2uGYxzUWQ=";
})
];
NIX_CFLAGS_COMPILE = "-Wno-error=unused-result";
NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=deprecated-declarations";
postPatch = ''
# fix unprefixed ranlib (needed on cross)

40
pkgs/tools/text/mdbook-kroki-preprocessor/default.nix Normal file
View file

@ -0,0 +1,40 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, openssl
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "mdbook-kroki-preprocessor";
version = "0.1.2";
src = fetchFromGitHub {
owner = "joelcourtney";
repo = "mdbook-kroki-preprocessor";
rev = "v${version}";
hash = "sha256-1TJuUzfyMycWlOQH67LR63/ll2GDZz25I3JfScy/Jnw=";
};
cargoHash = "sha256-IKwDWymAQ1OMQN8Op+DcvqPikoLdOz6lltbhCgOAles=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
openssl
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.Security
];
meta = with lib; {
description = "Render Kroki diagrams from files or code blocks in mdbook";
homepage = "https://github.com/joelcourtney/mdbook-kroki-preprocessor";
license = licenses.gpl3Only;
maintainers = with maintainers; [ blaggacao ];
};
}

4
pkgs/tools/virtualization/google-guest-oslogin/default.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "google-guest-oslogin";
version = "20220721.00";
version = "20230202.00";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = "guest-oslogin";
rev = version;
sha256 = "sha256-VIbejaHN9ANk+9vjpGAYS/SjHx4Tf7SkTqRD1svJRPU=";
sha256 = "sha256-5+8AMm97+GJJYmzKaJ98AtDBwpVXj88d3B8KwZgMpSg=";
};
postPatch = ''

17
pkgs/top-level/all-packages.nix
View file

@ -9046,6 +9046,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
mdbook-kroki-preprocessor = callPackage ../tools/text/mdbook-kroki-preprocessor { };
mdbook-linkcheck = callPackage ../tools/text/mdbook-linkcheck {
inherit (darwin.apple_sdk.frameworks) Security;
};
@ -18514,6 +18516,8 @@ with pkgs;
speedtest-cli = with python3Packages; toPythonApplication speedtest-cli;
spicy-parser-generator = callPackage ../development/tools/parsing/spicy { };
spin = callPackage ../development/tools/analysis/spin { };
spirv-headers = callPackage ../development/libraries/spirv-headers { };
@ -21992,6 +21996,8 @@ with pkgs;
opencl-clang = callPackage ../development/libraries/opencl-clang { };
magic-enum = callPackage ../development/libraries/magic-enum { };
mapnik = callPackage ../development/libraries/mapnik {
harfbuzz = harfbuzz.override {
withIcu = true;
@ -30529,8 +30535,6 @@ with pkgs;
kail = callPackage ../tools/networking/kail { };
kanboard = callPackage ../applications/misc/kanboard { };
kapitonov-plugins-pack = callPackage ../applications/audio/kapitonov-plugins-pack { };
kapow = libsForQt5.callPackage ../applications/misc/kapow { };
@ -38474,9 +38478,7 @@ with pkgs;
xorex = callPackage ../tools/security/xorex { };
xbps = callPackage ../tools/package-management/xbps {
openssl = openssl_1_1;
};
xbps = callPackage ../tools/package-management/xbps { };
xcftools = callPackage ../tools/graphics/xcftools { };
@ -38696,8 +38698,9 @@ with pkgs;
openring = callPackage ../applications/misc/openring { };
openvino = callPackage ../development/libraries/openvino
{ stdenv = gcc10StdenvCompat; python = python3; };
openvino = callPackage ../development/libraries/openvino {
python = python3;
};
phonetisaurus = callPackage ../development/libraries/phonetisaurus {
# https://github.com/AdolfVonKleist/Phonetisaurus/issues/70

13
pkgs/top-level/python-packages.nix
View file

@ -1075,8 +1075,6 @@ self: super: with self; {
azure-storage-blob = callPackage ../development/python-modules/azure-storage-blob { };
azure-storage = callPackage ../development/python-modules/azure-storage { };
azure-storage-common = callPackage ../development/python-modules/azure-storage-common { };
azure-storage-file = callPackage ../development/python-modules/azure-storage-file { };
@ -6694,10 +6692,11 @@ self: super: with self; {
opentracing = callPackage ../development/python-modules/opentracing { };
openvino = toPythonModule (pkgs.openvino.override {
inherit (self) python;
enablePython = true;
});
openvino = callPackage ../development/python-modules/openvino {
openvino-native = pkgs.openvino.override {
inherit python;
};
};
openwebifpy = callPackage ../development/python-modules/openwebifpy { };
@ -12588,7 +12587,7 @@ self: super: with self; {
zdaemon = callPackage ../development/python-modules/zdaemon { };
zeek = (toPythonModule (pkgs.zeek.override {
zeek = (toPythonModule (pkgs.zeek.broker.override {
python3 = python;
})).py;