diff options
Diffstat (limited to 'pkgs/by-name/op')
33 files changed, 504 insertions, 317 deletions
diff --git a/pkgs/by-name/op/opcua-commander/package.nix b/pkgs/by-name/op/opcua-commander/package.nix index 9cbf043832bd7..be6a5569a9942 100644 --- a/pkgs/by-name/op/opcua-commander/package.nix +++ b/pkgs/by-name/op/opcua-commander/package.nix @@ -8,16 +8,16 @@ }: buildNpmPackage rec { pname = "opcua-commander"; - version = "0.37.0"; + version = "0.39.0"; src = fetchFromGitHub { owner = "node-opcua"; repo = "opcua-commander"; rev = version; - hash = "sha256-wQXSSNinY85Ti+D/zklYP2N8IP3OsN9xQNJuuQr4kVU="; + hash = "sha256-7KYwIdrhlvGR9RHZBfMFOcBa+opwx7Q/crCdvwZD6Y8="; }; - npmDepsHash = "sha256-Ux1X/3sam9WHrTfqoWv1r9p3pJOs6BaeFsxHizAvjXA="; + npmDepsHash = "sha256-g4WFLh+UnziQR2NZ4eL84Vrk+Mz99kFQiBkdGmBEMHE="; nativeBuildInputs = [ esbuild typescript makeWrapper ]; postPatch = '' diff --git a/pkgs/by-name/op/open-fprintd/package.nix b/pkgs/by-name/op/open-fprintd/package.nix index b8c8b765d550f..45aac839e399e 100644 --- a/pkgs/by-name/op/open-fprintd/package.nix +++ b/pkgs/by-name/op/open-fprintd/package.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages, gobject-introspection, wrapGAppsNoGuiHook }: python3Packages.buildPythonPackage rec { pname = "open-fprintd"; @@ -11,6 +11,8 @@ python3Packages.buildPythonPackage rec { sha256 = "sha256-uVFuwtsmR/9epoqot3lJ/5v5OuJjuRjL7FJF7oXNDzU="; }; + nativeBuildInputs = [ wrapGAppsNoGuiHook gobject-introspection ]; + propagatedBuildInputs = with python3Packages; [ dbus-python pygobject3 ]; checkInputs = with python3Packages; [ dbus-python ]; @@ -30,6 +32,9 @@ python3Packages.buildPythonPackage rec { --replace /usr/lib/open-fprintd "$out/lib/open-fprintd" ''; + dontWrapGApps = true; + makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; + postFixup = '' wrapPythonProgramsIn "$out/lib/open-fprintd" "$out $pythonPath" ''; diff --git a/pkgs/by-name/op/open-scq30/package.nix b/pkgs/by-name/op/open-scq30/package.nix index 3e2e41a15e98d..33d4e47c76fb8 100644 --- a/pkgs/by-name/op/open-scq30/package.nix +++ b/pkgs/by-name/op/open-scq30/package.nix @@ -44,6 +44,7 @@ rustPlatform.buildRustPackage rec { pango ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.CoreBluetooth darwin.apple_sdk.frameworks.CoreGraphics darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 1292ff3c27923..bb38012268ab1 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -7,19 +7,19 @@ }: let pname = "open-webui"; - version = "0.3.5"; + version = "0.3.12"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; rev = "v${version}"; - hash = "sha256-copxy9fgHTHfF14bh9ddF4eTWx2GP2Mkw3lr+1NKKkI="; + hash = "sha256-Ot8QsRgRbe0l37C9KGlREDCjq5nTTvcJ1TJaeBe2oxw="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-whddW3ThC/zlttqhV3wf15roaCgp0H/BELWLs9/c5Jc="; + npmDepsHash = "sha256-fr+IA6I1pE+vJ+uGE1sf2++s65rPzK//ZL+xT3QoLOA="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. @@ -59,12 +59,18 @@ python3.pkgs.buildPythonApplication rec { "opencv-python-headless" # using `psycopg2` instead "psycopg2-binary" + "docker" + "pytest" + "pytest-docker" ]; dependencies = with python3.pkgs; [ aiohttp + alembic + anthropic apscheduler argon2-cffi + authlib bcrypt beautifulsoup4 black @@ -85,18 +91,22 @@ python3.pkgs.buildPythonApplication rec { langchain-community langfuse markdown + openai opencv4 openpyxl pandas passlib peewee peewee-migrate + psutil psycopg2 pydub pyjwt + pymongo pymysql pypandoc pypdf + python-dotenv python-jose python-multipart python-pptx @@ -105,8 +115,10 @@ python3.pkgs.buildPythonApplication rec { pyxlsb rank-bm25 rapidocr-onnxruntime + redis requests sentence-transformers + tiktoken unstructured uvicorn validators @@ -116,8 +128,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ hatchling ]; - nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ]; - pythonImportsCheck = [ "open_webui" ]; makeWrapperArgs = [ "--set FRONTEND_BUILD_DIR ${frontend}/share/open-webui" ]; @@ -127,7 +137,7 @@ python3.pkgs.buildPythonApplication rec { }; meta = { - description = "Full-stack of open-webui. open-webui is a user-friendly WebUI for LLMs (Formerly Ollama WebUI)"; + description = "Comprehensive suite for LLMs with a user-friendly WebUI"; homepage = "https://github.com/open-webui/open-webui"; changelog = "https://github.com/open-webui/open-webui/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; diff --git a/pkgs/by-name/op/open62541/package.nix b/pkgs/by-name/op/open62541/package.nix index 49099e7b0e73a..832d376145e18 100644 --- a/pkgs/by-name/op/open62541/package.nix +++ b/pkgs/by-name/op/open62541/package.nix @@ -30,13 +30,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "open62541"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "open62541"; repo = "open62541"; rev = "v${finalAttrs.version}"; - hash = "sha256-An8Yg6VSelNV/7poLEOjeiIb0+eMoQWG7sYqhytEKMA="; + hash = "sha256-ziKtRojc/MqRPG//HPESzJa0W0YaHOlz2Mi35UujOkU="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/op/openai-triton-llvm/package.nix b/pkgs/by-name/op/openai-triton-llvm/package.nix deleted file mode 100644 index 7b6f40662a75e..0000000000000 --- a/pkgs/by-name/op/openai-triton-llvm/package.nix +++ /dev/null @@ -1,176 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkgsBuildBuild -, pkg-config -, cmake -, ninja -, git -, libxml2 -, libxcrypt -, libedit -, libffi -, libpfm -, mpfr -, zlib -, ncurses -, doxygen -, sphinx -, which -, sysctl -, python3Packages -, buildDocs ? true -, buildMan ? true -, buildTests ? true -, llvmTargetsToBuild ? [ "NATIVE" ] # "NATIVE" resolves into x86 or aarch64 depending on stdenv -, llvmProjectsToBuild ? [ "llvm" "mlir" ] -}: - -let - llvmNativeTarget = - if stdenv.hostPlatform.isx86_64 then "X86" - else if stdenv.hostPlatform.isAarch64 then "AArch64" - else throw "Currently unsupported LLVM platform '${stdenv.hostPlatform.config}'"; - - inferNativeTarget = t: if t == "NATIVE" then llvmNativeTarget else t; - llvmTargetsToBuild' = [ "AMDGPU" "NVPTX" ] ++ builtins.map inferNativeTarget llvmTargetsToBuild; - - # This LLVM version can't seem to find pygments/pyyaml, - # but a later update will likely fix this (openai-triton-2.1.0) - python = - if buildTests - then python3Packages.python.withPackages (p: with p; [ psutil pygments pyyaml ]) - else python3Packages.python; - - isNative = stdenv.hostPlatform == stdenv.buildPlatform; -in stdenv.mkDerivation (finalAttrs: { - pname = "openai-triton-llvm"; - version = "17.0.0-c5dede880d17"; - - outputs = [ - "out" - ] ++ lib.optionals buildDocs [ - "doc" - ] ++ lib.optionals buildMan [ - "man" - ]; - - # See https://github.com/openai/triton/blob/main/python/setup.py - # and https://github.com/ptillet/triton-llvm-releases/releases - src = fetchFromGitHub { - owner = "llvm"; - repo = "llvm-project"; - rev = "c5dede880d175f7229c9b2923f4753e12702305d"; - hash = "sha256-v4r3+7XVFK+Dzxt/rErZNJ9REqFO3JmGN4X4vZ+77ew="; - }; - - nativeBuildInputs = [ - pkg-config - cmake - ninja - git - python - ] ++ lib.optionals (buildDocs || buildMan) [ - doxygen - sphinx - python3Packages.recommonmark - ]; - - buildInputs = [ - libxml2 - libxcrypt - libedit - libffi - libpfm - mpfr - ]; - - propagatedBuildInputs = [ - zlib - ncurses - ]; - - sourceRoot = "${finalAttrs.src.name}/llvm"; - - cmakeFlags = [ - (lib.cmakeFeature "LLVM_TARGETS_TO_BUILD" (lib.concatStringsSep ";" llvmTargetsToBuild')) - (lib.cmakeFeature "LLVM_ENABLE_PROJECTS" (lib.concatStringsSep ";" llvmProjectsToBuild)) - (lib.cmakeFeature "LLVM_HOST_TRIPLE" stdenv.hostPlatform.config) - (lib.cmakeFeature "LLVM_DEFAULT_TARGET_TRIPLE" stdenv.hostPlatform.config) - (lib.cmakeBool "LLVM_INSTALL_UTILS" true) - (lib.cmakeBool "LLVM_INCLUDE_DOCS" (buildDocs || buildMan)) - (lib.cmakeBool "MLIR_INCLUDE_DOCS" (buildDocs || buildMan)) - (lib.cmakeBool "LLVM_BUILD_DOCS" (buildDocs || buildMan)) - # Way too slow, only uses one core - # (lib.cmakeBool "LLVM_ENABLE_DOXYGEN" (buildDocs || buildMan)) - (lib.cmakeBool "LLVM_ENABLE_SPHINX" (buildDocs || buildMan)) - (lib.cmakeBool "SPHINX_OUTPUT_HTML" buildDocs) - (lib.cmakeBool "SPHINX_OUTPUT_MAN" buildMan) - (lib.cmakeBool "SPHINX_WARNINGS_AS_ERRORS" false) - (lib.cmakeBool "LLVM_INCLUDE_TESTS" buildTests) - (lib.cmakeBool "MLIR_INCLUDE_TESTS" buildTests) - (lib.cmakeBool "LLVM_BUILD_TESTS" buildTests) - # Cross compilation code taken/modified from LLVM 16 derivation - ] ++ lib.optionals (!isNative) (let - nativeToolchainFlags = let - nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; - nativeBintools = nativeCC.bintools.bintools; - in [ - (lib.cmakeFeature "CMAKE_C_COMPILER" "${nativeCC}/bin/${nativeCC.targetPrefix}cc") - (lib.cmakeFeature "CMAKE_CXX_COMPILER" "${nativeCC}/bin/${nativeCC.targetPrefix}c++") - (lib.cmakeFeature "CMAKE_AR" "${nativeBintools}/bin/${nativeBintools.targetPrefix}ar") - (lib.cmakeFeature "CMAKE_STRIP" "${nativeBintools}/bin/${nativeBintools.targetPrefix}strip") - (lib.cmakeFeature "CMAKE_RANLIB" "${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib") - ]; - - # We need to repass the custom GNUInstallDirs values, otherwise CMake - # will choose them for us, leading to wrong results in llvm-config-native - nativeInstallFlags = [ - (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" (placeholder "out")) - (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "${placeholder "out"}/bin") - (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "${placeholder "out"}/include") - (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "${placeholder "out"}/lib") - (lib.cmakeFeature "CMAKE_INSTALL_LIBEXECDIR" "${placeholder "out"}/libexec") - ]; - in [ - (lib.cmakeBool "CMAKE_CROSSCOMPILING" true) - (lib.cmakeFeature "CROSS_TOOLCHAIN_FLAGS_NATIVE" (lib.concatStringsSep ";" - (lib.concatLists [ nativeToolchainFlags nativeInstallFlags ]))) - ]); - - postPatch = '' - # `CMake Error: cannot write to file "/build/source/llvm/build/lib/cmake/mlir/MLIRTargets.cmake": Permission denied` - chmod +w -R ../mlir - patchShebangs ../mlir/test/mlir-reduce - - # FileSystem permissions tests fail with various special bits - rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test - rm unittests/Support/Path.cpp - - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "Path.cpp" "" - '' + lib.optionalString stdenv.isAarch64 '' - # Not sure why this fails - rm test/tools/llvm-exegesis/AArch64/latency-by-opcode-name.s - ''; - - postInstall = lib.optionalString (!isNative) '' - cp -a NATIVE/bin/llvm-config $out/bin/llvm-config-native - ''; - - doCheck = buildTests; - - nativeCheckInputs = [ which ] - ++ lib.optionals stdenv.isDarwin [ sysctl ]; - - checkTarget = "check-all"; - requiredSystemFeatures = [ "big-parallel" ]; - - meta = with lib; { - description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = "https://github.com/llvm/llvm-project"; - license = with licenses; [ ncsa ]; - maintainers = with maintainers; [ SomeoneSerge Madouura ]; - platforms = with platforms; aarch64 ++ x86; - }; -}) diff --git a/pkgs/by-name/op/openapi-changes/package.nix b/pkgs/by-name/op/openapi-changes/package.nix index 0020856ee9751..8fe3904e744ca 100644 --- a/pkgs/by-name/op/openapi-changes/package.nix +++ b/pkgs/by-name/op/openapi-changes/package.nix @@ -7,15 +7,13 @@ buildGoModule rec { pname = "openapi-changes"; - version = "0.0.61"; + version = "0.0.67"; src = fetchFromGitHub { owner = "pb33f"; repo = pname; - # github reports `the given path has multiple possibilities` for the tagged release - # rev = "v${version}"; - rev = "f0bccc1fcf42ea6a97a81acc3283dbe14a3ebb51"; - hash = "sha256-D0jUXCxlf1aF0uc/P9Lgu9Va4Es3CQcko9BzGg1pCq8="; + rev = "v${version}"; + hash = "sha256-SNH11z/0DeaYfGwBKW3iIeCVdlpcoZ1elIlgl+quWIY="; }; # this test requires the `.git` of the project to be present @@ -29,7 +27,7 @@ buildGoModule rec { wrapProgram $out/bin/openapi-changes --prefix PATH : ${lib.makeBinPath [ git ]} ''; - vendorHash = "sha256-gaBVwrSaIwe1eh8voq928cxM/d0urVUF0OUwWZb2fR8="; + vendorHash = "sha256-VtwIAP2+FZ6Vpexcb9O68WfJdsTMrJn5bDjkxDe69e4="; meta = with lib; { description = "World's sexiest OpenAPI breaking changes detector"; diff --git a/pkgs/by-name/op/openapi-tui/package.nix b/pkgs/by-name/op/openapi-tui/package.nix index fdbc0b6cb1d3f..a7473ec66937c 100644 --- a/pkgs/by-name/op/openapi-tui/package.nix +++ b/pkgs/by-name/op/openapi-tui/package.nix @@ -2,20 +2,26 @@ , rustPlatform , fetchFromGitHub , pkg-config +, openssl }: rustPlatform.buildRustPackage rec { pname = "openapi-tui"; - version = "0.5.0"; + version = "0.9.4"; src = fetchFromGitHub { owner = "zaghaghi"; repo = "openapi-tui"; rev = version; - hash = "sha256-flxQ5+nLacQAkrxJafw9D3iXYTFpHcmTshEySmFJ0Cc="; + hash = "sha256-y8A43FV3PfYHaMMHE3uGRBaftga/pVSivCfV4iwUROA="; }; - cargoHash = "sha256-vfEDbUrIXc498QnMJJlMGyTUDvlHgquB5GpWTe7yCvM="; + cargoHash = "sha256-I1eTJDtQM9WKluOZJGfQT4Wn9TFyTu6ZcPFuh8wZIWI="; + + OPENSSL_NO_VENDOR = true; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; meta = with lib; { description = "Terminal UI to list, browse and run APIs defined with openapi spec"; @@ -25,4 +31,3 @@ rustPlatform.buildRustPackage rec { mainProgram = "openapi-tui"; }; } - diff --git a/pkgs/by-name/op/openasar/package.nix b/pkgs/by-name/op/openasar/package.nix index da858575ab06c..0d034ea1b8d1c 100644 --- a/pkgs/by-name/op/openasar/package.nix +++ b/pkgs/by-name/op/openasar/package.nix @@ -4,20 +4,19 @@ fetchFromGitHub, unstableGitUpdater, nodejs, - bash, asar, unzip, }: stdenv.mkDerivation (finalAttrs: { pname = "openasar"; - version = "0-unstable-2024-01-13"; + version = "0-unstable-2024-06-30"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "4f264d860a5a6a32e1862ce26178b9cf6402335d"; - hash = "sha256-NPUUDqntsMxnT/RN5M9DtLDwJXDyjOED4GlXa1oU8l8="; + rev = "5c875eb048e96543f1ec711fae522ace5e4a836c"; + hash = "sha256-dlf4X+2W2GfL2E46ZM35PqpcoKHoZ4fhroOCLpye1D0="; }; postPatch = '' diff --git a/pkgs/by-name/op/opencomposite/package.nix b/pkgs/by-name/op/opencomposite/package.nix index 173e4b05d76fb..db42ea0f9f784 100644 --- a/pkgs/by-name/op/opencomposite/package.nix +++ b/pkgs/by-name/op/opencomposite/package.nix @@ -1,37 +1,35 @@ -{ lib -, stdenv -, fetchFromGitLab - -, cmake - -, glm -, libGL -, openxr-loader -, python3 -, vulkan-headers -, vulkan-loader -, xorg - -, unstableGitUpdater +{ + cmake, + fetchFromGitLab, + glm, + jsoncpp, + lib, + libGL, + openxr-loader, + python3, + stdenv, + unstableGitUpdater, + vulkan-headers, + vulkan-loader, + xorg, }: stdenv.mkDerivation { pname = "opencomposite"; - version = "0-unstable-2024-06-12"; + version = "0-unstable-2024-07-23"; src = fetchFromGitLab { owner = "znixian"; repo = "OpenOVR"; - rev = "de1658db7e2535fd36c2e37fa8dd3d756280c86f"; - hash = "sha256-xyEiuEy3nt2AbF149Pjz5wi/rkTup2SgByR4DrNOJX0="; + rev = "632e5cc50b913e93194ca2970e6f13021182579f"; + hash = "sha256-KQmNyGRlbUrntTPNn5rzTyyR+Bvh3EfSqBgyNGGDo04="; }; - nativeBuildInputs = [ - cmake - ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ glm + jsoncpp libGL openxr-loader python3 @@ -41,10 +39,9 @@ stdenv.mkDerivation { ]; cmakeFlags = [ + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-error=format-security") (lib.cmakeBool "USE_SYSTEM_OPENXR" true) (lib.cmakeBool "USE_SYSTEM_GLM" true) - # debug logging macros cause format-security warnings - (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-error=format-security") ]; installPhase = '' @@ -59,10 +56,10 @@ stdenv.mkDerivation { branch = "openxr"; }; - meta = with lib; { + meta = { description = "Reimplementation of OpenVR, translating calls to OpenXR"; homepage = "https://gitlab.com/znixian/OpenOVR"; - license = with licenses; [ gpl3Only ]; - maintainers = with maintainers; [ Scrumplex ]; + license = with lib.licenses; [ gpl3Only ]; + maintainers = with lib.maintainers; [ Scrumplex ]; }; } diff --git a/pkgs/by-name/op/openctm/package.nix b/pkgs/by-name/op/openctm/package.nix index e255e209111dd..169e4469abcd8 100644 --- a/pkgs/by-name/op/openctm/package.nix +++ b/pkgs/by-name/op/openctm/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, pkg-config, - freeglut, + libglut, gtk2, libGLU, }: @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - freeglut + libglut gtk2 libGLU ]; diff --git a/pkgs/by-name/op/openfga-cli/package.nix b/pkgs/by-name/op/openfga-cli/package.nix index 4c08f32b3f749..4a0ea0be8876d 100644 --- a/pkgs/by-name/op/openfga-cli/package.nix +++ b/pkgs/by-name/op/openfga-cli/package.nix @@ -7,7 +7,7 @@ let pname = "openfga-cli"; - version = "0.4.1"; + version = "0.5.2"; in buildGoModule { @@ -17,10 +17,10 @@ buildGoModule { owner = "openfga"; repo = "cli"; rev = "v${version}"; - hash = "sha256-Eex2Bts0A6Lu5M626idVK3lqVCX+2WosD8YrQP4DuC8="; + hash = "sha256-tWGklsAsZ+kBTjpA2by3S0fSpUMNkh9dFKJ7DPzXNRA="; }; - vendorHash = "sha256-cr9Y72ilUZxAjOIopx7VmZVtE8TxJhxdKSJIj6NawRI="; + vendorHash = "sha256-GDYj4KcRK9/J5BTuUsk4f+qBrkT3ofP141mmKIqZAWA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix index e4421c334df0f..45b15d5f38e5f 100644 --- a/pkgs/by-name/op/openfga/package.nix +++ b/pkgs/by-name/op/openfga/package.nix @@ -7,7 +7,7 @@ let pname = "openfga"; - version = "1.5.4"; + version = "1.5.6"; in buildGoModule { @@ -17,10 +17,10 @@ buildGoModule { owner = "openfga"; repo = "openfga"; rev = "v${version}"; - hash = "sha256-0K4z5CPNx+MVJ1PeB8rmO8+6hDGZ3ZALTFBWwR2Xl1k="; + hash = "sha256-R5BqaKiW2jhglJ6zPPQF2Ld97YCttocjhfbo0dDGvCI="; }; - vendorHash = "sha256-sihNWuxwptBrVO9sXD2YNP20mgwYU2y4NSb8wqVWmCk="; + vendorHash = "sha256-zrhLG5msji6t4VPKG85jD8c2XQCRdQkF9UfRMqnzSFM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/op/opengfw/package.nix b/pkgs/by-name/op/opengfw/package.nix new file mode 100644 index 0000000000000..ad1b57dcad3a4 --- /dev/null +++ b/pkgs/by-name/op/opengfw/package.nix @@ -0,0 +1,37 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +let + pname = "opengfw"; + version = "0.4.0"; +in +buildGoModule { + inherit pname version; + CGO_ENABLED = 0; + vendorHash = "sha256-F8jTvgxOhOGVtl6B8u0xAIvjNwVjBtvAhApzjIgykpY="; + + src = fetchFromGitHub { + owner = "apernet"; + repo = "opengfw"; + rev = "refs/tags/v${version}"; + hash = "sha256-kmbG6l5CtZGM/zpvl2pukq5xsOIy28RDyb4sHBsoyOw="; + }; + + meta = { + mainProgram = "OpenGFW"; + description = "Flexible, easy-to-use, open source implementation of GFW on Linux"; + longDescription = '' + OpenGFW is your very own DIY Great Firewall of China, available as a flexible, + easy-to-use open source program on Linux. Why let the powers that be have all the fun? + It's time to give power to the people and democratize censorship. + Bring the thrill of cyber-sovereignty right into your home router + and start filtering like a pro - you too can play Big Brother. + ''; + homepage = "https://gfw.dev/"; + license = lib.licenses.mpl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ eum3l ]; + }; +} diff --git a/pkgs/by-name/op/opengist/package.nix b/pkgs/by-name/op/opengist/package.nix index 053c088a69904..03b23225ada81 100644 --- a/pkgs/by-name/op/opengist/package.nix +++ b/pkgs/by-name/op/opengist/package.nix @@ -65,7 +65,7 @@ buildGoModule { mainProgram = "opengist"; homepage = "https://github.com/thomiceli/opengist"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ lf- ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/op/openh264/package.nix b/pkgs/by-name/op/openh264/package.nix index c8eed276e1039..ebd93572e29ed 100644 --- a/pkgs/by-name/op/openh264/package.nix +++ b/pkgs/by-name/op/openh264/package.nix @@ -43,6 +43,9 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/cisco/openh264/releases/tag/${finalAttrs.src.rev}"; license = with lib.licenses; [ bsd2 ]; maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.platforms.unix ++ lib.platforms.windows; + # See meson.build + platforms = lib.platforms.windows ++ lib.intersectLists + (lib.platforms.x86 ++ lib.platforms.arm ++ lib.platforms.aarch64 ++ lib.platforms.loongarch64) + (lib.platforms.linux ++ lib.platforms.darwin); }; }) diff --git a/pkgs/by-name/op/openjph/package.nix b/pkgs/by-name/op/openjph/package.nix new file mode 100644 index 0000000000000..5fcebb7af663a --- /dev/null +++ b/pkgs/by-name/op/openjph/package.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, cmake, validatePkgConfig, testers, nix-update-script }: + +stdenv.mkDerivation (finalAttrs: { + pname = "openjph"; + version = "0.15.0"; + + src = fetchFromGitHub { + owner = "aous72"; + repo = "openjph"; + rev = finalAttrs.version; + hash = "sha256-v4rqBTS6rk5fgDQqvqPwFAYxLNxtsRhZuQsj+y3sE3o="; + }; + + nativeBuildInputs = [ cmake validatePkgConfig ]; + + outputs = [ "out" "dev" ]; + + cmakeFlags = [ + (lib.cmakeBool "OJPH_ENABLE_TIFF_SUPPORT" false) + ]; + + strictDeps = true; + + passthru = { + tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Open-source implementation of JPEG2000 Part-15 (or JPH or HTJ2K)"; + homepage = "https://openjph.org/"; + maintainers = with lib.maintainers; [ abustany ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.unix; + pkgConfigModules = [ "openjph" ]; + }; +}) diff --git a/pkgs/by-name/op/openmesh/package.nix b/pkgs/by-name/op/openmesh/package.nix index c391517d60441..2a1e065044a81 100644 --- a/pkgs/by-name/op/openmesh/package.nix +++ b/pkgs/by-name/op/openmesh/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "OpenMesh"; rev = "OpenMesh-${lib.versions.majorMinor finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-1FmAieCaskKaaAWjgEXr/CWpFxrhB2Rca1sXpxLrQHw="; + hash = "sha256-1FmAieCaskKaaAWjgEXr/CWpFxrhB2Rca1sXpxLrQHw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/op/openpam/package.nix b/pkgs/by-name/op/openpam/package.nix new file mode 100644 index 0000000000000..f0e823780a4a8 --- /dev/null +++ b/pkgs/by-name/op/openpam/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenv, + fetchurl, + autoreconfHook, + pkg-config, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "openpam"; + version = "20230627"; + + src = fetchurl { + url = "mirror://sourceforge/openpam/openpam/Ximenia/openpam-${finalAttrs.version}.tar.gz"; + hash = "sha256-DZrI9bVaYkH1Bz8T7/HpVGFCLEWsGjBEXX4QaOkdtP0="; + }; + + strictDeps = true; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + __structuredAttrs = true; + + meta = with lib; { + homepage = "https://www.openpam.org"; + description = "Open source PAM library that focuses on simplicity, correctness, and cleanliness"; + platforms = platforms.unix; + maintainers = with maintainers; [ matthewbauer ]; + license = licenses.bsd3; + }; +}) diff --git a/pkgs/by-name/op/openpgp-ca/package.nix b/pkgs/by-name/op/openpgp-ca/package.nix index 0db67f6a22a2a..e97087ccf5964 100644 --- a/pkgs/by-name/op/openpgp-ca/package.nix +++ b/pkgs/by-name/op/openpgp-ca/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "openpgp-ca"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitLab { owner = "openpgp-ca"; repo = "openpgp-ca"; rev = "openpgp-ca/v${version}"; - hash = "sha256-6K7H/d82Ge+JQykqTXAD43wlGTQl+U9D/vA+CNz4rfM="; + hash = "sha256-71SApct2yQV3ueWDlZv7ScK1s0nWWS57cPCvoMutlLA="; }; - cargoHash = "sha256-PrbepiaQbfGEqJRIcOMR6ED3BLopZLhospTzWRUoW0A="; + cargoHash = "sha256-L0Z+Oxov0y+PipdXz8/3Y0MKYhr/lNYurphc9s0K+Dg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/op/openpgp-card-tools/package.nix b/pkgs/by-name/op/openpgp-card-tools/package.nix index a0dbd7e10a253..00a4be3e9ece3 100644 --- a/pkgs/by-name/op/openpgp-card-tools/package.nix +++ b/pkgs/by-name/op/openpgp-card-tools/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "openpgp-card-tools"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitea { domain = "codeberg.org"; owner = "openpgp-card"; repo = "openpgp-card-tools"; rev = "v${version}"; - hash = "sha256-4PRUBzVy1sb15sYsbitBrOfQnsdbGKoR2OA4EjSc8B8="; + hash = "sha256-htFhNzBuinj9qiTzcW0eia74jvCT/+9b1aLli594JJQ="; }; - cargoHash = "sha256-Jm1181WQfYZPKnu0f2om/hxkJ8Bm5AA/3IwBgZkpF0I="; + cargoHash = "sha256-I2ExtUUM0ZJyhtyzP+IsgiMPMUFVHqPiMHFlvuUMjRc="; nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix index 1e14580b42bb5..b0881fe10e05e 100644 --- a/pkgs/by-name/op/openscad-unstable/package.nix +++ b/pkgs/by-name/op/openscad-unstable/package.nix @@ -41,15 +41,16 @@ let # get cccl from source to avoid license issues nvidia-cccl = clangStdenv.mkDerivation { pname = "nvidia-cccl"; - # note that v2.2.0 has some cmake issues - version = "2.2.0-unstable-2024-01-26"; + # note, after v2.2.0, manifold dependency fails with some swap() ambiguities + version = "2.2.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "cccl"; fetchSubmodules = true; - rev = "0c9d03276206a5f59368e908e3d643610f9fddcd"; - hash = "sha256-f11CNfa8jF9VbzvOoX1vT8zGIJL9cZ/VBpiklUn0YdU="; + rev = "v2.2.0"; + hash = "sha256-azHDAuK0rAHrH+XkN3gHDrbwZOclP3zbEMe8VRpMjDQ="; }; + patches = [ ./thrust-cmake.patch ]; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ tbb_2021_11 ]; cmakeFlags = [ @@ -81,12 +82,12 @@ in # clang consume much less RAM than GCC clangStdenv.mkDerivation rec { pname = "openscad-unstable"; - version = "2024-03-10"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "db167b1df31fbd8a2101cf3a13dac148b0c2165d"; - hash = "sha256-i2ZGYsNfMLDi3wRd/lohs9BuO2KuQ/7kJIXGtV65OQU="; + rev = "48f4430b12c29a95ab89ffdd8307205d7189421c"; + hash = "sha256-A75JHmWVNlgURb5one5JFkztCrVff2RbyaDaObUp4ZY="; fetchSubmodules = true; }; patches = [ ./test.diff ]; @@ -149,11 +150,14 @@ clangStdenv.mkDerivation rec { "-DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld" "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON" ]; + doCheck = true; + + nativeCheckInputs = [ + mesa.llvmpipeHook + ]; + checkPhase = '' - # for running mesa llvmpipe - export __EGL_VENDOR_LIBRARY_FILENAMES=${mesa.drivers}/share/glvnd/egl_vendor.d/50_mesa.json - export LIBGL_DRIVERS_PATH=${mesa.drivers}/lib:${mesa.drivers}/lib/dri # some fontconfig issues cause pdf output to have wrong font ctest -j$NIX_BUILD_CORES -E pdfexporttest.\* ''; diff --git a/pkgs/by-name/op/openscad-unstable/thrust-cmake.patch b/pkgs/by-name/op/openscad-unstable/thrust-cmake.patch new file mode 100644 index 0000000000000..56422f0992183 --- /dev/null +++ b/pkgs/by-name/op/openscad-unstable/thrust-cmake.patch @@ -0,0 +1,13 @@ +diff --git a/thrust/thrust/cmake/thrust-header-search.cmake.in b/thrust/thrust/cmake/thrust-header-search.cmake.in +index 8529d89fe..94879ee01 100644 +--- a/thrust/thrust/cmake/thrust-header-search.cmake.in ++++ b/thrust/thrust/cmake/thrust-header-search.cmake.in +@@ -7,7 +7,6 @@ set(from_install_prefix "@from_install_prefix@") + find_path(_THRUST_VERSION_INCLUDE_DIR thrust/version.h + NO_CMAKE_FIND_ROOT_PATH # Don't allow CMake to re-root the search + NO_DEFAULT_PATH # Only search explicit paths below: +- PATHS +- "${CMAKE_CURRENT_LIST_DIR}/${from_install_prefix}/@CMAKE_INSTALL_INCLUDEDIR@" ++ PATHS "@CMAKE_INSTALL_INCLUDEDIR@" + ) + set_property(CACHE _THRUST_VERSION_INCLUDE_DIR PROPERTY TYPE INTERNAL) diff --git a/pkgs/by-name/op/openscap/package.nix b/pkgs/by-name/op/openscap/package.nix new file mode 100755 index 0000000000000..4f807219d31fc --- /dev/null +++ b/pkgs/by-name/op/openscap/package.nix @@ -0,0 +1,160 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + libsepol, + popt, + libxml2, + libxslt, + openssl, + util-linux, + pcre2, + pcre, + libselinux, + graphviz, + glib, + python3, + swig, + libgcrypt, + opendbx, + xmlbird, + haskellPackages, + libyaml, + yaml-filter, + xmlsec, + bzip2, + valgrind, + asciidoc, + installShellFiles, + rpm, + system-sendmail, + hyperscan, + gnome2, + curl, + procps, + systemd, + perl, + doxygen, + pkg-config, + perl538Packages, +}: + +stdenv.mkDerivation rec { + pname = "openscap"; + version = "1.3.10"; + + src = fetchFromGitHub { + owner = "OpenSCAP"; + repo = "openscap"; + rev = version; + hash = "sha256-P7k+Ygz/XmpTSKBEqbyJsd1bIDVJ1HA/RJdrEtjYD5g="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + asciidoc + doxygen + rpm + swig + util-linux + pkg-config + ]; + + buildInputs = + with perl538Packages; + [ + XMLXPath + LinuxACL + XMLTokeParser + ] + ++ [ + perl + popt + openssl + valgrind + pcre2 + pcre + libxslt + xmlsec + hyperscan + libselinux + libyaml + xmlbird + installShellFiles + bzip2 + yaml-filter + python3 + libgcrypt + libxml2 + systemd + haskellPackages.pthread + graphviz + system-sendmail + procps + libsepol + curl + glib + gnome2.ORBit2 + opendbx + ]; + + prePatch = '' + export SWIG_PERL_DIR=lib/perl + substituteInPlace swig/perl/CMakeLists.txt \ + --replace-fail "DESTINATION ''${PERL_VENDORLIB}" "DESTINATION ''${SWIG_PERL_DIR}''${PERL_VERSION}" \ + --replace-fail "DESTINATION ''${PERL_VENDORARCH}" "DESTINATION ''${SWIG_PERL_DIR}" + substituteInPlace src/common/oscap_pcre.c \ + --replace-fail "#include <pcre2.h>" "#include <${pcre2.dev}/include/pcre2.h>" \ + --replace-fail "#include <pcre.h>" "#include <${pcre.dev}/include/pcre.h>" + ''; + + cmakeFlags = [ + "-DPCRE2_INCLUDE_DIRS=${pcre2.dev}/include" + "-DPCRE2_LIBRARIES=${pcre2.out}/lib" + "-DENABLE_DOCS=TRUE" + "-DENABLE_TESTS=TRUE" + "-DENABLE_OSCAP_UTIL=TRUE" + "-DENABLE_OSCAP_UTIL_CHROOT=TRUE" + "-DENABLE_OSCAP_UTIL_SSH=TRUE" + "-DENABLE_OSCAP_UTIL_DOCKER=TRUE" + "-DENABLE_OSCAP_REMEDIATE_SERVICE=TRUE" + "-DOPENSCAP_PROBE_INDEPENDENT_YAMLFILECONTENT=TRUE" + "-DSYSTEMD_UNITDIR=lib/systemd/system" + "-DENABLE_VALGRIND=TRUE" + "-DENABLE_OSCAP_REMEDIATE_SERVICE=TRUE" + "-DPYTHON_SITE_PACKAGES_INSTALL_DIR=${python3.pkgs.python.sitePackages}" + "-DOPENSCAP_INSTALL_DESTINATION=bin" + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_MANDIR=share" + "-DENABLE_MITRE=TRUE" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_DATADIR=share" + "-DBUILD_TESTING=ON" + "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" + "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" + ]; + + postBuild = '' + make docs + ''; + + installPhase = '' + make install + installManPage $out/share/man8/*.8 + rm -rf $out/share/man8 + ''; + + meta = { + description = "NIST Certified SCAP 1.2 toolkit"; + homepage = "https://github.com/OpenSCAP/openscap"; + changelog = "https://github.com/OpenSCAP/openscap/blob/${src.rev}/NEWS"; + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ tochiaha ]; + mainProgram = "oscap"; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/op/opensnitch-ui/package.nix b/pkgs/by-name/op/opensnitch-ui/package.nix index 7628df552c76d..d697826f03d6b 100644 --- a/pkgs/by-name/op/opensnitch-ui/package.nix +++ b/pkgs/by-name/op/opensnitch-ui/package.nix @@ -1,27 +1,28 @@ -{ python3Packages +{ python311Packages , fetchFromGitHub +, nix-update-script , qt5 , lib }: -python3Packages.buildPythonApplication rec { +python311Packages.buildPythonApplication rec { pname = "opensnitch-ui"; - version = "1.6.5.1"; + version = "1.6.6"; src = fetchFromGitHub { owner = "evilsocket"; repo = "opensnitch"; rev = "refs/tags/v${version}"; - hash = "sha256-IVrAAHzLS7A7cYhRk+IUx8/5TGKeqC7M/7iXOpPe2ZA="; + hash = "sha256-pJPpkXRp7cby6Mvc7IzxH9u6MY4PcrRPkimTw3je6iI="; }; postPatch = '' substituteInPlace ui/opensnitch/utils/__init__.py \ - --replace /usr/lib/python3/dist-packages/data ${python3Packages.pyasn}/${python3Packages.python.sitePackages}/pyasn/data + --replace /usr/lib/python3/dist-packages/data ${python311Packages.pyasn}/${python311Packages.python.sitePackages}/pyasn/data ''; nativeBuildInputs = [ - python3Packages.pyqt5 + python311Packages.pyqt5 qt5.wrapQtAppsHook ]; @@ -29,7 +30,7 @@ python3Packages.buildPythonApplication rec { qt5.qtwayland ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python311Packages; [ grpcio-tools notify2 pyasn @@ -56,7 +57,7 @@ python3Packages.buildPythonApplication rec { ''; postInstall = '' - mv $out/${python3Packages.python.sitePackages}/usr/* $out/ + mv $out/${python311Packages.python.sitePackages}/usr/* $out/ ''; dontWrapQtApps = true; @@ -65,6 +66,8 @@ python3Packages.buildPythonApplication rec { # All tests are sandbox-incompatible and disabled for now doCheck = false; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Application firewall"; mainProgram = "opensnitch-ui"; diff --git a/pkgs/by-name/op/opensnitch/package.nix b/pkgs/by-name/op/opensnitch/package.nix index dec178c4031c6..41172f038cc85 100644 --- a/pkgs/by-name/op/opensnitch/package.nix +++ b/pkgs/by-name/op/opensnitch/package.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "opensnitch"; - version = "1.6.5.1"; + version = "1.6.6"; src = fetchFromGitHub { owner = "evilsocket"; repo = "opensnitch"; rev = "refs/tags/v${version}"; - hash = "sha256-IVrAAHzLS7A7cYhRk+IUx8/5TGKeqC7M/7iXOpPe2ZA="; + hash = "sha256-pJPpkXRp7cby6Mvc7IzxH9u6MY4PcrRPkimTw3je6iI="; }; postPatch = '' diff --git a/pkgs/by-name/op/opensplat/package.nix b/pkgs/by-name/op/opensplat/package.nix index cd6052f5369b0..d808a403e7bd8 100644 --- a/pkgs/by-name/op/opensplat/package.nix +++ b/pkgs/by-name/op/opensplat/package.nix @@ -4,13 +4,13 @@ cmake, ninja, fetchFromGitHub, - fetchpatch, python3, opencv, nlohmann_json, nanoflann, glm, cxxopts, + nix-update-script, config, # Upstream has rocm/hip support, too. anyone? cudaSupport ? config.cudaSupport, @@ -18,7 +18,7 @@ autoAddDriverRunpath, }: let - version = "1.1.2"; + version = "1.1.3"; torch = python3.pkgs.torch.override { inherit cudaSupport; }; # Using a normal stdenv with cuda torch gives # ld: /nix/store/k1l7y96gv0nc685cg7i3g43i4icmddzk-python3.11-torch-2.2.1-lib/lib/libc10.so: undefined reference to `std::ios_base_library_init()@GLIBCXX_3.4.32' @@ -32,27 +32,9 @@ stdenv'.mkDerivation { owner = "pierotofy"; repo = "OpenSplat"; rev = "refs/tags/v${version}"; - hash = "sha256-3tk62b5fSf6wzuc5TwkdfAKgUMrw3ZxetCJa2RVMS/s="; + hash = "sha256-2NcKb2SWU/vNsnd2KhdU85J60fJPuc44ZxIle/1UT6g="; }; - patches = [ - (fetchpatch { - name = "install-executables.patch"; - url = "https://github.com/pierotofy/OpenSplat/commit/b4c4176819b508978583b7ebf66306171807a8e6.patch"; - hash = "sha256-BUgPMcO3lt3ZEzv24u36k3aTEIoloOhxrCGi1KQ5Epk="; - }) - ]; - - postPatch = '' - # the two vendored gsplats are so heavily modified they may be considered a fork - find vendor ! -name 'gsplat*' -maxdepth 1 -mindepth 1 -exec rm -rf {} + - mkdir vendor/{nanoflann,glm} - ln -s ${glm}/include/glm vendor/glm/glm - ln -s ${nanoflann}/include/nanoflann.hpp vendor/nanoflann/nanoflann.hpp - ln -s ${nlohmann_json}/include/nlohmann vendor/json - ln -s ${cxxopts}/include/cxxopts.hpp vendor/cxxopts.hpp - ''; - nativeBuildInputs = [ cmake ninja @@ -63,6 +45,9 @@ stdenv'.mkDerivation { buildInputs = [ nlohmann_json + nanoflann + glm + cxxopts torch.cxxdev torch opencv @@ -74,15 +59,23 @@ stdenv'.mkDerivation { cmakeFlags = [ (lib.cmakeBool "CMAKE_SKIP_RPATH" true) + (lib.cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS") ] ++ lib.optionals cudaSupport [ (lib.cmakeFeature "GPU_RUNTIME" "CUDA") (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${cudaPackages.cudatoolkit}/") ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Production-grade 3D gaussian splatting"; homepage = "https://github.com/pierotofy/OpenSplat/"; - license = lib.licenses.mit; + license = [ + # main + lib.licenses.agpl3Only + # vendored+modified gsplat + lib.licenses.asl20 + ]; maintainers = [ lib.maintainers.jcaesar ]; platforms = lib.platforms.linux ++ lib.optionals (!cudaSupport) lib.platforms.darwin; }; diff --git a/pkgs/by-name/op/opentelemetry-cpp/package.nix b/pkgs/by-name/op/opentelemetry-cpp/package.nix index dcb01890a0c32..97a7af508fb69 100644 --- a/pkgs/by-name/op/opentelemetry-cpp/package.nix +++ b/pkgs/by-name/op/opentelemetry-cpp/package.nix @@ -15,19 +15,19 @@ let opentelemetry-proto = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-proto"; - rev = "v1.0.0"; - hash = "sha256-1IylAZs8gElpruSX52A+ZopU8jXH/MjRE+FQV3gQ+Gk="; + rev = "v1.3.2"; + hash = "sha256-bkVqPSVhyMHrmFvlI9DTAloZzDozj3sefIEwfW7OVrI="; }; in stdenv.mkDerivation (finalAttrs: { pname = "opentelemetry-cpp"; - version = "1.13.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-Tf1ZnmHavnwwvRb4Tes20LMld+w/2kRo5UErT8pHf3w="; + hash = "sha256-31zwIZ4oehhfn+oCyg8VQTurPOmdgp72plH1Pf/9UKQ="; }; patches = [ @@ -73,6 +73,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/open-telemetry/opentelemetry-cpp"; license = [ lib.licenses.asl20 ]; maintainers = with lib.maintainers; [ jfroche ]; + platforms = lib.platforms.linux; # https://github.com/protocolbuffers/protobuf/issues/14492 broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); }; diff --git a/pkgs/by-name/op/openturns/package.nix b/pkgs/by-name/op/openturns/package.nix index e6f3fb3a5ff7f..58ca6a4139b59 100644 --- a/pkgs/by-name/op/openturns/package.nix +++ b/pkgs/by-name/op/openturns/package.nix @@ -29,13 +29,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "openturns"; - version = "1.22"; + version = "1.23"; src = fetchFromGitHub { owner = "openturns"; repo = "openturns"; rev = "v${finalAttrs.version}"; - hash = "sha256-ku3/mPoa1YJVJB99R/kWlOubIO+OZAiKfPqS/DrtJQk="; + hash = "sha256-csl5cZvxU8fdLKvh04ZWKizClrHqF79c7tAMSejo2lk="; }; nativeBuildInputs = [ @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "USE_SPHINX" enablePython) (lib.cmakeFeature "CMAKE_UNITY_BUILD_BATCH_SIZE" "32") (lib.cmakeFeature "SWIG_COMPILE_FLAGS" "-O1") - (lib.cmakeOptionType "PATH" "OPENTURNS_SYSCONFIG_PATH" "$out/etc") + (lib.cmakeOptionType "PATH" "OPENTURNS_SYSCONFIG_PATH" "${placeholder "out"}/etc") ]; checkTarget = lib.concatStringsSep " " [ diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix index 53b6d621e0dbf..baba85269424b 100644 --- a/pkgs/by-name/op/openvas-scanner/package.nix +++ b/pkgs/by-name/op/openvas-scanner/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "openvas-scanner"; - version = "23.5.0"; + version = "23.8.2"; src = fetchFromGitHub { owner = "greenbone"; repo = "openvas-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-bAQFMYHE9nozmfRILFAswN9y0DxnX8LK2E6c3yqzWlA="; + hash = "sha256-sHu6GF+T5Ce2aiGccv9uM+KdAWCLB8CCXujxgxhg4Ho="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/openvswitch/generic.nix b/pkgs/by-name/op/openvswitch/generic.nix index b3c00ab18203e..95fea77f8d1e5 100644 --- a/pkgs/by-name/op/openvswitch/generic.nix +++ b/pkgs/by-name/op/openvswitch/generic.nix @@ -20,23 +20,29 @@ pkg-config, procps, python3, + tcpdump, sphinxHook, util-linux, which, writeScript, + makeWrapper, + withDPDK ? false, + dpdk, + numactl, + libpcap, }: let _kernel = kernel; in stdenv.mkDerivation rec { - pname = "openvswitch"; + pname = if withDPDK then "openvswitch-dpdk" else "openvswitch"; inherit version; kernel = lib.optional (_kernel != null) _kernel.dev; src = fetchurl { - url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; + url = "https://www.openvswitch.org/releases/openvswitch-${version}.tar.gz"; inherit hash; }; @@ -60,29 +66,39 @@ stdenv.mkDerivation rec { libtool pkg-config sphinxHook + makeWrapper ]; sphinxBuilders = [ "man" ]; sphinxRoot = "./Documentation"; - buildInputs = [ - libcap_ng - openssl - perl - procps - python3 - util-linux - which - ]; + buildInputs = + [ + libcap_ng + openssl + perl + procps + python3 + util-linux + which + ] + ++ (lib.optionals withDPDK [ + dpdk + numactl + libpcap + ]); preConfigure = "./boot.sh"; - configureFlags = [ - "--localstatedir=/var" - "--sharedstatedir=/var" - "--sbindir=$(out)/bin" - ] ++ (lib.optionals (_kernel != null) [ "--with-linux" ]); + configureFlags = + [ + "--localstatedir=/var" + "--sharedstatedir=/var" + "--sbindir=$(out)/bin" + ] + ++ (lib.optionals (_kernel != null) [ "--with-linux" ]) + ++ (lib.optionals withDPDK [ "--with-dpdk=shared" ]); # Leave /var out of this! installFlags = [ @@ -96,6 +112,13 @@ stdenv.mkDerivation rec { postInstall = '' installShellCompletion --bash utilities/ovs-appctl-bashcomp.bash installShellCompletion --bash utilities/ovs-vsctl-bashcomp.bash + + wrapProgram $out/bin/ovs-l3ping \ + --prefix PYTHONPATH : $out/share/openvswitch/python + + wrapProgram $out/bin/ovs-tcpdump \ + --prefix PATH : ${lib.makeBinPath [ tcpdump ]} \ + --prefix PYTHONPATH : $out/share/openvswitch/python ''; doCheck = true; @@ -138,6 +161,7 @@ stdenv.mkDerivation rec { adamcstephens kmcopper netixx + xddxdd ]; platforms = platforms.linux; }; diff --git a/pkgs/by-name/op/opshin/package.nix b/pkgs/by-name/op/opshin/package.nix index d7fdf72a8163d..7a1a9801eb1f0 100644 --- a/pkgs/by-name/op/opshin/package.nix +++ b/pkgs/by-name/op/opshin/package.nix @@ -1,11 +1,12 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "opshin"; - version = "0.20.0"; + version = "0.21.2"; format = "pyproject"; @@ -13,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "OpShin"; repo = "opshin"; rev = version; - hash = "sha256-fJlPeVAuEf80FVxdXnaKASLmjMEgz6ysXenUY72+sos="; + hash = "sha256-YBdYF04iKUwIZncqyEDalU+YN6/qwlx/vQDzZ19GaPU="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -27,6 +28,11 @@ python3.pkgs.buildPythonApplication rec { ordered-set ]; + pythonRelaxDeps = [ + "pluthon" + "uplc" + ]; + meta = with lib; { description = "Simple pythonic programming language for Smart Contracts on Cardano"; homepage = "https://opshin.dev"; diff --git a/pkgs/by-name/op/optinix/package.nix b/pkgs/by-name/op/optinix/package.nix new file mode 100644 index 0000000000000..18d21f17724bb --- /dev/null +++ b/pkgs/by-name/op/optinix/package.nix @@ -0,0 +1,36 @@ +{ + lib, + fetchFromGitLab, + buildGoModule, + installShellFiles, +}: +buildGoModule rec { + pname = "optinix"; + version = "0.1.1"; + + src = fetchFromGitLab { + owner = "hmajid2301"; + repo = "optinix"; + rev = "v${version}"; + hash = "sha256-bRHesc03jExIL29BCP93cMbx+BOT4sHCu58JjpmRaeA="; + }; + + vendorHash = "sha256-uSFEhRWvJ83RGpekPJL9MOYJy2NfgVdZxuaNUMq3VaE="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd optinix \ + --bash <($out/bin/optinix completion bash) \ + --fish <($out/bin/optinix completion fish) \ + --zsh <($out/bin/optinix completion zsh) + ''; + + meta = { + description = "Tool for searching options in Nix"; + homepage = "https://gitlab.com/hmajid2301/optinix"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hmajid2301 ]; + mainProgram = "optinix"; + }; +} |