ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 08:59:32 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-06-26 06:01:20 +00:00 committed by GitHub
commit 55b22a1f00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 208 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -14062,6 +14062,12 @@
githubId = 687198;
name = "Yuri Aisaka";
};
yurkobb = {
name = "Yury Bulka";
email = "setthemfree@privacyrequired.com";
github = "yurkobb";
githubId = 479389;
};
yurrriq = {
email = "eric@ericb.me";
github = "yurrriq";

4
pkgs/applications/misc/mapproxy/default.nix
View File

@ -6,10 +6,10 @@
with python3.pkgs;
buildPythonApplication rec {
pname = "MapProxy";
version = "1.14.0";
version = "1.15.1";
src = fetchPypi {
inherit pname version;
sha256 = "dd36278d60cdcaaf31f7f9bbc50e90e770f3feb65cf4b3eff287215ee85f018d";
sha256 = "sha256-SVKZDLH8IfdND0/BFj/lrqp7BNanpzkjuTxlSMGjuiY=";
};
prePatch = ''
substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv"

4
pkgs/applications/networking/cluster/argo/default.nix
View File

@ -19,13 +19,13 @@ let
in
buildGoModule rec {
pname = "argo";
version = "3.3.5";
version = "3.3.8";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
rev = "v${version}";
sha256 = "sha256-EeGpJliE38MroeScdmeMp36rEDld59zDEM5i4QqxYik=";
sha256 = "sha256-9RwUKLVf8ArDAE6ivbWqxDCCW4OjqQFEEoWHBIv/cww=";
};
vendorSha256 = "sha256-cq452XEGMVbLvfJ/UiVyOvnUSJr196owB3SyBYnAmZ0=";

6
pkgs/applications/networking/cluster/atlantis/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "atlantis";
version = "0.19.3";
version = "0.19.4";
src = fetchFromGitHub {
owner = "runatlantis";
repo = "atlantis";
rev = "v${version}";
sha256 = "sha256-0/LrXdksljoTvhOWAyKzR/8fNqM6ZqCjfgTNUfZNdXw=";
sha256 = "sha256-OvUcSccSBLuWci0DZPd6+ztthnAf47CvuAxu2NnqRQ0=";
};
vendorSha256 = "sha256-HEMyJRNk7sii87cZBfuQy41n0sI+On4271bVVNVWXeg=";
vendorSha256 = "sha256-LActkTCZ7/KlvFmJ+58I8hTQWdxFxlRN09Jmj1vDa2U=";
subPackages = [ "." ];

6
pkgs/applications/networking/cluster/fluxctl/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fluxctl";
version = "1.25.1";
version = "1.25.2";
src = fetchFromGitHub {
owner = "weaveworks";
repo = "flux";
rev = version;
sha256 = "sha256-l/BPnqa0j0yAdrl9BxFUKt94JwiNyPq1gKYuhGj/c8w=";
sha256 = "sha256-OZLTT54InDPF+m5e4xtuAL311wCD16Ne/T0PbgiSaN4=";
};
vendorSha256 = "sha256-PZriaKbgRKm7ssHOBmbzbma5LrRt0TsQiphSrtcT83k=";
vendorSha256 = "sha256-Q9THG76/B/gdfhf5wLxVXoAAzXeOjaaAyYaGKy9LeF0=";
nativeBuildInputs = [ installShellFiles ];

4
pkgs/applications/video/clapper/default.nix
View File

@ -24,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "clapper";
version = "0.4.1";
version = "0.5.1";
src = fetchFromGitHub {
owner = "Rafostar";
repo = pname;
rev = version;
sha256 = "sha256-ccvg8yxPCN7OYmJvq0SPY6iyiuFuWJyiu+mRoykEzqI=";
sha256 = "sha256-o68IdI20gSwWCPI0g/BhUGF5ro6srXMy0JD1EgmY5ck=";
};
nativeBuildInputs = [

42
pkgs/development/libraries/audio/libopenmpt-modplug/default.nix Normal file
View File

@ -0,0 +1,42 @@
{ stdenv
, lib
, fetchurl
, autoreconfHook
, pkg-config
, libopenmpt
}:
stdenv.mkDerivation rec {
pname = "libopenmpt-modplug";
version = "0.8.9.0-openmpt1";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://lib.openmpt.org/files/libopenmpt-modplug/libopenmpt-modplug-${version}.tar.gz";
sha256 = "sha256-7M4aDuz9sLWCTKuJwnDc5ZWWKVosF8KwQyFez018T/c=";
};
enableParallelBuilding = true;
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [
libopenmpt
];
configureFlags = [
"--enable-libmodplug"
];
meta = with lib; {
description = "A libmodplug emulation layer based on libopenmpt";
homepage = "https://lib.openmpt.org/libopenmpt/";
license = licenses.bsd3;
maintainers = with maintainers; [ OPNA2608 ];
platforms = platforms.unix;
};
}

7
pkgs/development/libraries/capnproto/default.nix
View File

@ -6,14 +6,14 @@
stdenv.mkDerivation rec {
pname = "capnproto";
version = "0.9.1";
version = "0.10.1";
# release tarballs are missing some ekam rules
src = fetchFromGitHub {
owner = "capnproto";
repo = "capnproto";
rev = "v${version}";
sha256 = "0cbiwkmd29abih8rjjm35dfkrkr8c6axbzq3fkryay6jyvpi42c5";
sha256 = "sha256-VdeoTU802kAqTdu8CJTIhy3xHM3ZCPqb5YNUS2k1x7E=";
};
nativeBuildInputs = [ cmake ]
@ -21,9 +21,6 @@ stdenv.mkDerivation rec {
cmakeFlags = lib.optional (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) "-DEXTERNAL_CAPNP";
# Upstream 77ac9154440bcc216fda1092fd5bb51da62ae09c, modified to apply to v0.9.1. Drop on update.
patches = lib.optional stdenv.hostPlatform.isMusl ./musl-no-fibers.patch;
meta = with lib; {
homepage = "https://capnproto.org/";
description = "Cap'n Proto cerealization protocol";

244
pkgs/development/libraries/capnproto/musl-no-fibers.patch
View File

@ -1,244 +0,0 @@
From 3d983eff304c28574c330a52d70a60145c9e157e Mon Sep 17 00:00:00 2001
From: Jonas Vautherin <jonas.vautherin@gmail.com>
Date: Fri, 14 Jan 2022 00:14:26 +0100
Subject: [PATCH] Add support for musl
---
Based on upstream 77ac9154440bcc216fda1092fd5bb51da62ae09c,
modified slightly by dtzWill to apply to v0.9.1.
(drop whitespace change to a cmake "if (WITH_OPENSSL)",
leave the other instance of that change since it applies)
---
Co-authored-by: Guillaume Papin <guillaume.papin@epitech.eu>
(cherry picked from commit 77ac9154440bcc216fda1092fd5bb51da62ae09c)
---
.github/workflows/quick-test.yml | 9 ++++++
c++/CMakeLists.txt | 46 ++++++++++++++++++++++++++++-
c++/cmake/CapnProtoConfig.cmake.in | 32 ++++++++++++++++++++
c++/configure.ac | 47 ++++++++++++++++++++++++++++--
c++/src/kj/CMakeLists.txt | 11 ++++++-
5 files changed, 141 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/quick-test.yml b/.github/workflows/quick-test.yml
index c18ef6a6..773ff043 100644
--- a/.github/workflows/quick-test.yml
+++ b/.github/workflows/quick-test.yml
@@ -10,6 +10,15 @@ on:
- 'release-*'
jobs:
+ Linux-musl:
+ runs-on: ubuntu-latest
+ container: alpine:latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: install dependencies
+ run: apk add autoconf automake build-base cmake libtool libucontext-dev linux-headers openssl-dev
+ - name: super-test
+ run: ./super-test.sh quick
Linux:
runs-on: ubuntu-latest
strategy:
diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt
index 548dfd1f..5de7ab26 100644
--- a/c++/CMakeLists.txt
+++ b/c++/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.6)
project("Cap'n Proto" CXX)
set(VERSION 0.9.1)
@@ -64,6 +64,50 @@ elseif (WITH_OPENSSL)
find_package(OpenSSL REQUIRED COMPONENTS Crypto SSL)
endif()
+set(WITH_FIBERS "AUTO" CACHE STRING
+ "Whether or not to build libkj-async with fibers")
+# define list of values GUI will offer for the variable
+set_property(CACHE WITH_FIBERS PROPERTY STRINGS AUTO ON OFF)
+
+# CapnProtoConfig.cmake.in needs this variable.
+set(_WITH_LIBUCONTEXT OFF)
+
+if (WITH_FIBERS OR WITH_FIBERS STREQUAL "AUTO")
+ set(_capnp_fibers_found OFF)
+ if (WIN32 OR CYGWIN)
+ set(_capnp_fibers_found ON)
+ else()
+ # Fibers need makecontext, setcontext, getcontext, swapcontext that may be in libc,
+ # or in libucontext (e.g. for musl).
+ # We assume that makecontext implies that the others are present.
+ include(CheckLibraryExists)
+ check_library_exists(c makecontext "" HAVE_UCONTEXT_LIBC)
+ if (HAVE_UCONTEXT_LIBC)
+ set(_capnp_fibers_found ON)
+ else()
+ # Try with libucontext
+ find_package(PkgConfig)
+ if (PKG_CONFIG_FOUND)
+ pkg_check_modules(libucontext IMPORTED_TARGET libucontext)
+ if (libucontext_FOUND)
+ set(_WITH_LIBUCONTEXT ON)
+ set(_capnp_fibers_found ON)
+ endif()
+ else()
+ set(_capnp_fibers_found OFF)
+ endif()
+ endif()
+ endif()
+
+ if (_capnp_fibers_found)
+ set(WITH_FIBERS ON)
+ elseif(WITH_FIBERS STREQUAL "AUTO")
+ set(WITH_FIBERS OFF)
+ else()
+ message(FATAL_ERROR "Missing 'makecontext', 'getcontext', 'setcontext' or 'swapcontext' symbol in libc and no libucontext found: KJ won't be able to build with fibers. Disable fibers (-DWITH_FIBERS=OFF).")
+ endif()
+endif()
+
if(MSVC)
# TODO(cleanup): Enable higher warning level in MSVC, but make sure to test
# build with that warning level and clean out false positives.
diff --git a/c++/cmake/CapnProtoConfig.cmake.in b/c++/cmake/CapnProtoConfig.cmake.in
index 667f502f..0580b11a 100644
--- a/c++/cmake/CapnProtoConfig.cmake.in
+++ b/c++/cmake/CapnProtoConfig.cmake.in
@@ -62,6 +62,38 @@ if (@WITH_OPENSSL@) # WITH_OPENSSL
endif()
endif()
+if (@_WITH_LIBUCONTEXT@) # _WITH_LIBUCONTEXT
+ set(forwarded_config_flags)
+ if(CapnProto_FIND_QUIETLY)
+ list(APPEND forwarded_config_flags QUIET)
+ endif()
+ if(CapnProto_FIND_REQUIRED)
+ list(APPEND forwarded_config_flags REQUIRED)
+ endif()
+ # If the consuming project called find_package(CapnProto) with the QUIET or REQUIRED flags, forward
+ # them to calls to find_package(PkgConfig) and pkg_check_modules(). Note that find_dependency()
+ # would do this for us in the former case, but there is no such forwarding wrapper for
+ # pkg_check_modules().
+
+ find_package(PkgConfig ${forwarded_config_flags})
+ if(NOT ${PkgConfig_FOUND})
+ # If we're here, the REQUIRED flag must not have been passed, else we would have had a fatal
+ # error. Nevertheless, a diagnostic for this case is probably nice.
+ if(NOT CapnProto_FIND_QUIETLY)
+ message(WARNING "pkg-config cannot be found")
+ endif()
+ set(CapnProto_FOUND OFF)
+ return()
+ endif()
+
+ if (CMAKE_VERSION VERSION_LESS 3.6)
+ # CMake >= 3.6 required due to the use of IMPORTED_TARGET
+ message(SEND_ERROR "libucontext support requires CMake >= 3.6.")
+ endif()
+
+ pkg_check_modules(libucontext IMPORTED_TARGET ${forwarded_config_flags} libucontext)
+endif()
+
include("${CMAKE_CURRENT_LIST_DIR}/CapnProtoTargets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/CapnProtoMacros.cmake")
diff --git a/c++/configure.ac b/c++/configure.ac
index 72fe8456..b627bec8 100644
--- a/c++/configure.ac
+++ b/c++/configure.ac
@@ -32,6 +32,11 @@ AC_ARG_WITH([openssl],
[build libkj-tls by linking against openssl @<:@default=check@:>@])],
[],[with_openssl=check])
+AC_ARG_WITH([fibers],
+ [AS_HELP_STRING([--with-fibers],
+ [build libkj-async with fibers @<:@default=check@:>@])],
+ [],[with_fibers=check])
+
AC_ARG_ENABLE([reflection], [
AS_HELP_STRING([--disable-reflection], [
compile Cap'n Proto in "lite mode", in which all reflection APIs (schema.h, dynamic.h, etc.)
@@ -195,8 +200,46 @@ AS_IF([test "$with_openssl" != no], [
])
AM_CONDITIONAL([BUILD_KJ_TLS], [test "$with_openssl" != no])
-# CapnProtoConfig.cmake.in needs this variable.
-AC_SUBST(WITH_OPENSSL, $with_openssl)
+# Fibers need the symbols getcontext, setcontext, swapcontext and makecontext.
+# We assume that makecontext implies the rest.
+AS_IF([test "$with_fibers" != no], [
+ libc_supports_fibers=yes
+ AC_SEARCH_LIBS([makecontext], [], [], [
+ libc_supports_fibers=no
+ ])
+
+ AS_IF([test "$libc_supports_fibers" = yes], [
+ with_fibers=yes
+ ], [
+ # If getcontext does not exist in libc, try with libucontext
+ ucontext_supports_fibers=yes
+ AC_CHECK_LIB(ucontext, [makecontext], [], [
+ ucontext_supports_fibers=no
+ ])
+ AS_IF([test "$ucontext_supports_fibers" = yes], [
+ ASYNC_LIBS="$ASYNC_LIBS -lucontext"
+ with_fibers=yes
+ ], [
+ AS_IF([test "$with_fibers" = yes], [
+ AC_MSG_ERROR([Missing symbols required for fibers (makecontext, setcontext, ...). Disable fibers (--without-fibers) or install libucontext])
+ ], [
+ AC_MSG_WARN([could not find required symbols (makecontext, setcontext, ...) -- won't build with fibers])
+ with_fibers=no
+ ])
+ ])
+ ])
+])
+AS_IF([test "$with_fibers" = yes], [
+ CXXFLAGS="$CXXFLAGS -DKJ_USE_FIBERS"
+], [
+ CXXFLAGS="$CXXFLAGS -DKJ_USE_FIBERS=0"
+])
+
+# CapnProtoConfig.cmake.in needs these variables,
+# we force them to NO because we don't need the CMake dependency for them,
+# the dependencies are provided by the .pc files.
+AC_SUBST(WITH_OPENSSL, NO)
+AC_SUBST(_WITH_LIBUCONTEXT, NO)
AM_CONDITIONAL([HAS_FUZZING_ENGINE], [test "x$LIB_FUZZING_ENGINE" != "x"])
diff --git a/c++/src/kj/CMakeLists.txt b/c++/src/kj/CMakeLists.txt
index 813fac4d..f7b4dddf 100644
--- a/c++/src/kj/CMakeLists.txt
+++ b/c++/src/kj/CMakeLists.txt
@@ -136,6 +136,15 @@ if(NOT CAPNP_LITE)
add_library(kj-async ${kj-async_sources})
add_library(CapnProto::kj-async ALIAS kj-async)
target_link_libraries(kj-async PUBLIC kj)
+ if(WITH_FIBERS)
+ target_compile_definitions(kj-async PUBLIC KJ_USE_FIBERS)
+ if(_WITH_LIBUCONTEXT)
+ target_link_libraries(kj-async PUBLIC PkgConfig::libucontext)
+ endif()
+ else()
+ target_compile_definitions(kj-async PUBLIC KJ_USE_FIBERS=0)
+ endif()
+
if(UNIX)
# external clients of this library need to link to pthreads
target_compile_options(kj-async INTERFACE "-pthread")
@@ -181,7 +190,7 @@ if(NOT CAPNP_LITE)
add_library(kj-tls ${kj-tls_sources})
add_library(CapnProto::kj-tls ALIAS kj-tls)
target_link_libraries(kj-tls PUBLIC kj-async)
- if (WITH_OPENSSL)
+ if(WITH_OPENSSL)
target_compile_definitions(kj-tls PRIVATE KJ_HAS_OPENSSL)
target_link_libraries(kj-tls PRIVATE OpenSSL::SSL OpenSSL::Crypto)
endif()
--
2.35.1

4
pkgs/development/libraries/folly/default.nix
View File

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "folly";
version = "2022.05.23.00";
version = "2022.06.13.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
sha256 = "sha256-ti/aqVg6b3ZPEI72AZNo/4NrtlI/mKQb39tlTw+3VG4=";
sha256 = "sha256-30Fzk97wVK0JR/6YllyBjW9KlYrFj+GJpuV+V2bKXL8=";
};
nativeBuildInputs = [

11
pkgs/development/libraries/hunspell/dictionaries.nix
View File

@ -845,4 +845,15 @@ rec {
platforms = platforms.all;
};
};
/* CROATIAN */
hr_HR = hr-hr;
hr-hr = mkDictFromLibreOffice {
shortName = "hr-hr";
dictFileName = "hr_HR";
shortDescription = "Croatian (Croatia)";
readmeFile = "README_hr_HR.txt";
license = with lib.licenses; [ gpl2Only lgpl21Only mpl11 ];
};
}

4
pkgs/development/python-modules/Pmw/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Pmw";
version = "2.0.1";
version = "2.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "080iml3868nxniyn56kcwnbghm10j7fw74a5nj0s19sm4zsji78b";
sha256 = "sha256-lIQSRXz8zwx3XdCOCRP7APkIlqM8eXN9VxxzEq6vVcY=";
};
propagatedBuildInputs = [ tkinter ];

4
pkgs/development/python-modules/aiosteamist/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "aiosteamist";
version = "0.3.1";
version = "0.3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "bdraco";
repo = pname;
rev = version;
hash = "sha256-VoIJh3EDBPKmvEmM3gP2pyt/0oz4i6Y0zIkkprTcFLg=";
hash = "sha256-IKrAJ4QDcYJRO4hcomL9FRs8hJ3k7SgRgK4H1b8SxIM=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/ansible/default.nix
View File

@ -20,7 +20,7 @@
let
pname = "ansible";
version = "5.8.0";
version = "6.0.0";
in
buildPythonPackage {
inherit pname version;
@ -30,7 +30,7 @@ buildPythonPackage {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-+gVkdiAfQGJfs22VxQQe9GOIC+GL5cc7mYtXtAGWeGM=";
sha256 = "sha256-ZBosJ7xXaPmorRSIDx9uVxwfKvHUXnbycdduP3R1TFM=";
};
postPatch = ''

26
pkgs/development/python-modules/cocotb/0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch Normal file
View File

@ -0,0 +1,26 @@
From 94c4768cd69b026e498d92133dd6c7d8589cf911 Mon Sep 17 00:00:00 2001
From: Jiajie Chen <c@jia.je>
Date: Sat, 25 Jun 2022 10:19:44 +0800
Subject: [PATCH] Patch LDCXXSHARED for macOS along with LDSHARED
In Nixpkgs, we patched distutils to respect LDCXXSHARED environment, so
the replacement should be taken on LDCXXSHARED as well.
---
cocotb_build_libs.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/cocotb_build_libs.py b/cocotb_build_libs.py
index 66097ec2..d5555b36 100755
--- a/cocotb_build_libs.py
+++ b/cocotb_build_libs.py
@@ -583,6 +583,7 @@ def get_ext():
if sys.platform == "darwin":
cfg_vars["LDSHARED"] = cfg_vars["LDSHARED"].replace("-bundle", "-dynamiclib")
+ cfg_vars["LDCXXSHARED"] = cfg_vars["LDCXXSHARED"].replace("-bundle", "-dynamiclib")
share_lib_dir = os.path.relpath(os.path.join(cocotb_share_dir, "lib"))
include_dir = os.path.relpath(os.path.join(cocotb_share_dir, "include"))
--
2.36.1

10
pkgs/development/python-modules/cocotb/default.nix
View File

@ -40,8 +40,17 @@ buildPythonPackage rec {
# remove circular dependency cocotb-bus from setup.py
substituteInPlace setup.py --replace "'cocotb-bus<1.0'" ""
'' + lib.optionalString stdenv.isDarwin ''
# disable lto on darwin
# https://github.com/NixOS/nixpkgs/issues/19098
substituteInPlace cocotb_build_libs.py --replace "-flto" ""
'';
patches = [
# Fix "can't link with bundle (MH_BUNDLE) only dylibs (MH_DYLIB) file" error
./0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch
];
checkInputs = [ cocotb-bus pytestCheckHook swig verilog ];
checkPhase = ''
@ -53,6 +62,5 @@ buildPythonPackage rec {
homepage = "https://github.com/cocotb/cocotb";
license = licenses.bsd3;
maintainers = with maintainers; [ matthuszagh ];
broken = stdenv.isDarwin;
};
}

4
pkgs/development/python-modules/nibabel/default.nix
View File

@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "nibabel";
version = "3.2.2";
version = "4.0.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-sNzBdLMEBc6ej+weqzy7sg9cXkkgl2wIsi4FC3wST5Q=";
sha256 = "sha256-bVvOqRGZYn1KEAhmzVfmR5Nkh3MAJ5Evl1z59us4AYA=";
};
propagatedBuildInputs = [ numpy scipy h5py packaging pydicom ];

24
pkgs/development/python-modules/oscpy/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook }:
buildPythonPackage rec {
pname = "oscpy";
version = "0.6.0";
src = fetchFromGitHub {
owner = "kivy";
repo = "oscpy";
rev = "v${version}";
hash = "sha256-Luj36JLgU9xbBMydeobyf98U5zs5VwWQOPGV7TPXQwA=";
};
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "oscpy" ];
meta = with lib; {
description = "A modern implementation of OSC for python2/3";
license = licenses.mit;
homepage = "https://github.com/kivy/oscpy";
maintainers = [ maintainers.yurkobb ];
};
}

4
pkgs/development/tools/build-managers/scala-cli/sources.json
View File

@ -1,6 +1,10 @@
{
"version": "0.1.8",
"assets": {
"aarch64-darwin": {
"asset": "scala-cli-x86_64-apple-darwin.gz",
"sha256": "1dxhwhdk7kflzn4ckqxfxkz4v26l39ki6ykpml6k6kvy3nn0wwz3"
},
"x86_64-darwin": {
"asset": "scala-cli-x86_64-apple-darwin.gz",
"sha256": "1dxhwhdk7kflzn4ckqxfxkz4v26l39ki6ykpml6k6kvy3nn0wwz3"

6
pkgs/development/tools/earthly/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "earthly";
version = "0.6.14";
version = "0.6.16";
src = fetchFromGitHub {
owner = "earthly";
repo = "earthly";
rev = "v${version}";
sha256 = "sha256-1zJPtx+W+UuH+upun1o9f3ofieahTsb4bSuznPhIYnw=";
sha256 = "sha256-PKvF5dO7aFF3WOAWOxFTy1PpCr6o9s4QjQkgI7EO6Ss=";
};
vendorSha256 = "sha256-2bOaJdK12qGjjVtoBp3LeSyIiFwm4ZvxNI5yR0HriXI=";
vendorSha256 = "sha256-ESPi6ZjN2GkvzVidmBmuglL4Oh0EjyhGBdvjjiXB38s=";
ldflags = [
"-s" "-w"

4
pkgs/development/tools/flyway/default.nix
View File

@ -1,10 +1,10 @@
{ lib, stdenv, fetchurl, jre_headless, makeWrapper }:
stdenv.mkDerivation rec{
pname = "flyway";
version = "8.5.11";
version = "8.5.13";
src = fetchurl {
url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
sha256 = "sha256-qmDvubyWWBRTbspVDSACiklC6a8l5n4y88vz3VZFnV0=";
sha256 = "sha256-9MEsZ5lc9cF7MKD+dYdZGR9cnMHFxELACp4gsC0gzRc=";
};
nativeBuildInputs = [ makeWrapper ];
dontBuild = true;

8
pkgs/misc/opensbi/default.nix
View File

@ -6,15 +6,19 @@
stdenv.mkDerivation rec {
pname = "opensbi";
version = "1.0";
version = "1.1";
src = fetchFromGitHub {
owner = "riscv-software-src";
repo = "opensbi";
rev = "v${version}";
sha256 = "sha256-OgzcH+RLU680qF3+lUiWFFbif6YtjIknJriGlRqcOGs=";
sha256 = "sha256-k6f4/lWY/f7qqk0AFY4tdEi4cDilSv/jngaJYhKFlnY=";
};
postPatch = ''
patchShebangs ./scripts
'';
installFlags = [
"I=$(out)"
];

4
pkgs/servers/http/apache-modules/mod_cspnonce/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "mod_cspnonce";
version = "1.3";
version = "1.4";
src = fetchFromGitHub {
owner = "wyattoday";
repo = "mod_cspnonce";
rev = version;
sha256 = "0kqvxf1dn8r0ywrfiwsxryjrxii2sq11wisbjnm7770sjwckwqh5";
hash = "sha256-uUWRKUjS2LvHgT5xrK+LZLQRHc6wMaxGca2OsVxVlRs=";
};
buildInputs = [ apacheHttpd ];

31
pkgs/servers/search/lnx/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ stdenv
, lib
, rustPlatform
, fetchFromGitHub
, DiskArbitration
, Foundation
}:
# unstable was chosen because of an added Cargo.lock
# revert to stable for the version after 0.9.0
let version = "unstable-2022-06-25";
in
rustPlatform.buildRustPackage {
pname = "lnx";
inherit version;
src = fetchFromGitHub {
owner = "lnx-search";
repo = "lnx";
rev = "2cb80f344c558bfe37f21ccfb83265bf351419d9";
sha256 = "sha256-iwoZ6xRzEDArmhWYxIrbIXRTQjOizyTsXCvMdnUrs2g=";
};
cargoSha256 = "sha256-JpsZ37u3+4+X8knTxoGmJisopTsPR221rv3Bu4DMZZI=";
buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ];
meta = with lib; {
description = "Insanely fast, Feature-rich searching. lnx is the adaptable, typo tollerant deployment of the tantivy search engine. Standing on the shoulders of giants. ";
homepage = "https://lnx.rs/";
license = licenses.mit;
maintainers = with maintainers; [ happysalada ];
platforms = platforms.unix;
};
}

6
pkgs/tools/compression/bzip3/default.nix
View File

@ -2,11 +2,12 @@
, stdenv
, fetchFromGitHub
, autoreconfHook
, pkg-config
}:
stdenv.mkDerivation rec {
pname = "bzip3";
version = "1.1.3";
version = "1.1.4";
outputs = [ "bin" "dev" "out" ];
@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
owner = "kspalaiologos";
repo = "bzip3";
rev = version;
hash = "sha256-puGtaL76p4BzSiTPf3qFgXN4pz90CDU9dziGIszk3to=";
hash = "sha256-rbJUvFm8WYgQLNpbX6kcXb5qAGAJfylTo4HgOvZVCu8=";
};
postPatch = ''
@ -24,6 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
pkg-config
];
configureFlags = [

2
pkgs/tools/misc/mandown/default.nix
View File

@ -15,6 +15,6 @@ rustPlatform.buildRustPackage rec {
description = "Markdown to groff (man page) converter";
homepage = "https://gitlab.com/kornelski/mandown";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ zowoq ];
maintainers = with maintainers; [ ];
};
}

10
pkgs/tools/security/witness/default.nix
View File

@ -2,25 +2,25 @@
buildGoModule rec {
pname = "witness";
version = "0.1.8";
version = "0.1.10";
src = fetchFromGitHub {
owner = "testifysec";
repo = pname;
rev = "v${version}";
sha256 = "sha256-i76sw5ysWDZwuNt7CYtpVy9mEV643i4YaMxksglyPWw=";
sha256 = "sha256-BRYp8gp3TNZrl6fRNHOIgdhCVCN+N2lReFk+0FxCUxY=";
};
vendorSha256 = "sha256-A3fnAWEJ7SeUnDfIIOkbHIhUBRB8INcqMleOLL3LHF0=";
vendorSha256 = "sha256-/NniYty50dO44VUTfVq9b8dbT3le4uZ2ZoDN4IjLBto=";
nativeBuildInputs = [ installShellFiles ];
# We only want the witness binary, not the helper utilities for generating docs.
subPackages = [ "cmd/witness" ];
subPackages = [ "." ];
ldflags = [
"-s"
"-w"
"-X github.com/testifysec/witness/cmd/witness/cmd.Version=v${version}"
"-X github.com/testifysec/witness/cmd.Version=v${version}"
];
# Feed in all tests for testing

6
pkgs/top-level/all-packages.nix
View File

@ -7727,6 +7727,10 @@ with pkgs;
lnch = callPackage ../tools/misc/lnch { };
lnx = callPackage ../servers/search/lnx {
inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation;
};
loadlibrary = callPackage ../tools/misc/loadlibrary { };
loc = callPackage ../development/misc/loc { };
@ -29083,6 +29087,8 @@ with pkgs;
libopenmpt = callPackage ../development/libraries/audio/libopenmpt { };
libopenmpt-modplug = callPackage ../development/libraries/audio/libopenmpt-modplug { };
openrazer-daemon = with python3Packages; toPythonApplication openrazer-daemon;
opusfile = callPackage ../applications/audio/opusfile { };

2
pkgs/top-level/python-packages.nix
View File

@ -6163,6 +6163,8 @@ in {
oscrypto = callPackage ../development/python-modules/oscrypto { };
oscpy = callPackage ../development/python-modules/oscpy { };
oset = callPackage ../development/python-modules/oset { };
osmnx = callPackage ../development/python-modules/osmnx { };