Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2023-08-02 12:02:00 +00:00
committed by GitHub
47 changed files with 391 additions and 185 deletions
+2 -2
View File
@@ -2595,7 +2595,7 @@
};
cafkafk = {
email = "christina@cafkafk.com";
matrix = "@cafkafk:m.cafkafk.com";
matrix = "@cafkafk:nixos.dev";
name = "Christina Sørensen";
github = "cafkafk";
githubId = 89321978;
@@ -2604,7 +2604,7 @@
fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8";
}
{
fingerprint = "208A 2A66 8A2F CDE7 B5D3 8F64 CDDC 792F 6552 51ED";
fingerprint = "208A 2A66 8A2F CDE7 B5D3 8F64 CDDC 792F 6552 51ED";
}
];
};
@@ -2594,6 +2594,22 @@ let
};
};
mskelton.npm-outdated = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "npm-outdated";
publisher = "mskelton";
version = "2.2.0";
sha256 = "sha256-kHItIlTW+PIVXrLgzdGAoPeR6sWKuKl/QyJ5+TIv3/E=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/mskelton.npm-outdated/changelog";
description = "Shows which packages are outdated in an npm project";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=mskelton.npm-outdated";
homepage = "https://github.com/mskelton/vscode-npm-outdated";
license = lib.licenses.isc;
};
};
mvllow.rose-pine = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "mvllow";
@@ -34,10 +34,10 @@
let
# Keep these separate so the update script can regex them
rpcs3GitVersion = "15372-38a5313ed";
rpcs3Version = "0.0.28-15372-38a5313ed";
rpcs3Revision = "38a5313ed2c4ebb626017a4f7f28ed0c0a89f931";
rpcs3Hash = "sha256-tiByoxPf++TK/Xowo2VQ+OEojoYIpX/B8caDyaMZ3Qc=";
rpcs3GitVersion = "15409-fd6829f75";
rpcs3Version = "0.0.28-15409-fd6829f75";
rpcs3Revision = "fd6829f7576da07e3bb90de8821834d3ce44610c";
rpcs3Hash = "sha256-I/CYDE7te8xxKjTyH1Mb45uemya5Sfjb96MQWlkFAbk=";
in
stdenv.mkDerivation {
pname = "rpcs3";
+5 -3
View File
@@ -1,6 +1,6 @@
{ blueprint-compiler
, desktop-file-utils
, fetchzip
, fetchFromSourcehut
, gobject-introspection
, gtk4
, lib
@@ -18,8 +18,10 @@ stdenv.mkDerivation rec {
pname = "confy";
version = "0.7.0";
src = fetchzip {
url = "https://git.sr.ht/~fabrixxm/confy/archive/${version}.tar.gz";
src = fetchFromSourcehut {
owner = "~fabrixxm";
repo = "confy";
rev = version;
hash = "sha256-q8WASTNbiBuKb2tPQBmUL9ji60PRAPnYOTYxnUn0MAw=";
};
+2 -2
View File
@@ -24,14 +24,14 @@ assert svgSupport -> enableCairo;
stdenv.mkDerivation rec {
pname = "fuzzel";
version = "1.9.1";
version = "1.9.2";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "dnkl";
repo = pname;
rev = version;
hash = "sha256-Va/Rm35jqxDlIfQdrpZ41qrW8YzWmm1LWra76AW1xUw=";
hash = "sha256-X1P/ghX97KCQcrNk44Cy2IAGuZ8DDwHBWzh1AHLDvd4=";
};
depsBuildBuild = [
+3 -3
View File
@@ -3,15 +3,15 @@
}:
let
pname = "josm";
version = "18772";
version = "18789";
srcs = {
jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
hash = "sha256-Jy8Z/uYmVKCr9Gq0pOmIG9jfTQekzlpkgQrTDZ+ALI0=";
hash = "sha256-0NuCdGqDNY+UCXv9AhX4oT0WJbxMc5ghkL0YvqVWXOs=";
};
macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip";
hash = "sha256-E125YYwVzLzbPh0bbz/FzJO+JysjBhKfpLKmMRO9nJc=";
hash = "sha256-f8VoPMF7cR6idzadkXC6/oUfzq4dnKb3UPa2JjsRNsw=";
};
pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
+2 -2
View File
@@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: let
in {
pname = "logseq";
version = "0.9.11";
version = "0.9.13";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
hash = "sha256-4qOXFSbHaoXqTmH6wSGyb6hutda63AxiKnUxJsHBtCg=";
hash = "sha256-fDE19E8FhyXG9RMbfKNCQrhMW5CzQPAp+zRSu4EQMt4=";
name = "${pname}-${version}.AppImage";
};
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "istioctl";
version = "1.18.1";
version = "1.18.2";
src = fetchFromGitHub {
owner = "istio";
repo = "istio";
rev = version;
sha256 = "sha256-+225LfSp9VP7J63kkbyi2Vj6UAFfb6jr+LLsFVe0ZcY=";
sha256 = "sha256-eSftWXwV8W/mpxZNvUUDS27z3vU36vJj/z0/Wo5qEts=";
};
vendorHash = "sha256-tuiQ11pcfoTOu+OVey+YmU4tTOj5C7p5bKP2ylEkUug=";
@@ -290,6 +290,15 @@
"spdx": "MPL-2.0",
"vendorHash": "sha256-foS7GyRUdhF/M8uTPf2I4WQo7qEg4Z/3FXjagoeSRkU="
},
"dexidp": {
"hash": "sha256-+Nt4bX6+4VB+mtJbsP166RObFbXaNyFrF+80x2/pRco=",
"homepage": "https://registry.terraform.io/providers/marcofranssen/dexidp",
"owner": "marcofranssen",
"repo": "terraform-provider-dexidp",
"rev": "v0.2.1",
"spdx": "MIT",
"vendorHash": "sha256-L8baV03p0V/xKi1O3YQxvoJXgP21qNhzznyvwrauVqI="
},
"dhall": {
"hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=",
"homepage": "https://registry.terraform.io/providers/awakesecurity/dhall",
@@ -7,8 +7,8 @@
}:
flutter.buildFlutterApplication rec {
pname = "fluffychat";
version = "1.12.1";
name = "fluffychat";
src = fetchFromGitLab {
owner = "famedly";
@@ -1,26 +0,0 @@
diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
index 790583cd5..763cf3548 100644
--- a/libobs/CMakeLists.txt
+++ b/libobs/CMakeLists.txt
@@ -455,6 +455,8 @@ elseif(OS_POSIX)
libobs PROPERTIES BUILD_RPATH "$<TARGET_FILE_DIR:OBS::libobs-opengl>")
endif()
+string(REGEX REPLACE "^${OBS_INSTALL_PREFIX}" "" OBS_PLUGIN_DESTINATION_RELATIVE ${OBS_PLUGIN_DESTINATION})
+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/obsconfig.h.in
${CMAKE_BINARY_DIR}/config/obsconfig.h)
diff --git a/libobs/obsconfig.h.in b/libobs/obsconfig.h.in
index 4a664285a..5cff2ca53 100644
--- a/libobs/obsconfig.h.in
+++ b/libobs/obsconfig.h.in
@@ -13,7 +13,7 @@
#define OBS_VERSION_CANONICAL "@OBS_VERSION_CANONICAL@"
#define OBS_DATA_PATH "@OBS_DATA_PATH@"
#define OBS_INSTALL_PREFIX "@OBS_INSTALL_PREFIX@"
-#define OBS_PLUGIN_DESTINATION "@OBS_PLUGIN_DESTINATION@"
+#define OBS_PLUGIN_DESTINATION "@OBS_PLUGIN_DESTINATION_RELATIVE@"
#define OBS_QT_VERSION @_QT_VERSION@
#cmakedefine LINUX_PORTABLE
+13 -10
View File
@@ -21,11 +21,12 @@
, xorg
, pkg-config
, libvlc
, libGL
, mbedtls
, wrapGAppsHook
, scriptingSupport ? true
, luajit
, swig
, swig4
, python3
, alsaSupport ? stdenv.isLinux
, alsa-lib
@@ -42,6 +43,9 @@
, srt
, qtwayland
, wrapQtAppsHook
, nlohmann_json
, websocketpp
, asio
}:
let
@@ -50,20 +54,20 @@ let
in
stdenv.mkDerivation rec {
pname = "obs-studio";
version = "29.0.2";
version = "29.1.3";
src = fetchFromGitHub {
owner = "obsproject";
repo = "obs-studio";
rev = version;
sha256 = "sha256-TIUSjyPEsKRNTSLQXuLJGEgD989hJ5GhOsqJ4nkKVsY=";
sha256 = "sha256-D0DPueMtopwz5rLgM8QcPT7DgTKcJKQHnst69EY9V6Q=";
fetchSubmodules = true;
};
patches = [
# Lets obs-browser build against CEF 90.1.0+
./Enable-file-access-and-universal-access-for-file-URL.patch
./Provide-runtime-plugin-destination-as-relative-path.patch
./fix-nix-plugin-path.patch
];
nativeBuildInputs = [
@@ -73,7 +77,7 @@ stdenv.mkDerivation rec {
wrapGAppsHook
wrapQtAppsHook
]
++ optional scriptingSupport swig;
++ optional scriptingSupport swig4;
buildInputs = [
curl
@@ -99,6 +103,9 @@ stdenv.mkDerivation rec {
libva
srt
qtwayland
nlohmann_json
websocketpp
asio
]
++ optionals scriptingSupport [ luajit python3 ]
++ optional alsaSupport alsa-lib
@@ -117,11 +124,7 @@ stdenv.mkDerivation rec {
cp -r ${libcef}/include cef/
'';
# obs attempts to dlopen libobs-opengl, it fails unless we make sure
# DL_OPENGL is an explicit path. Not sure if there's a better way
# to handle this.
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-DDL_OPENGL=\\\"$(out)/lib/libobs-opengl.so\\\""
"-DOBS_VERSION_OVERRIDE=${version}"
"-Wno-dev" # kill dev warnings that are useless for packaging
# Add support for browser source
@@ -133,7 +136,7 @@ stdenv.mkDerivation rec {
dontWrapGApps = true;
preFixup = ''
qtWrapperArgs+=(
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xorg.libX11 libvlc ]}"
--prefix LD_LIBRARY_PATH : "$out/lib:${lib.makeLibraryPath [ xorg.libX11 libvlc libGL ]}"
''${gappsWrapperArgs[@]}
)
'';
@@ -0,0 +1,13 @@
diff --git a/libobs/obs-nix.c b/libobs/obs-nix.c
index 36aac7097..801cec788 100644
--- a/libobs/obs-nix.c
+++ b/libobs/obs-nix.c
@@ -56,7 +56,7 @@ const char *get_module_extension(void)
#define FLATPAK_PLUGIN_PATH "/app/plugins"
static const char *module_bin[] = {
- OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION,
+ OBS_PLUGIN_DESTINATION,
"../../obs-plugins/" BIT_STRING,
FLATPAK_PLUGIN_PATH "/" OBS_PLUGIN_DESTINATION,
};
@@ -1,21 +1,31 @@
{ lib, stdenv, fetchFromGitHub, cmake, obs-studio }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, obs-studio }:
stdenv.mkDerivation rec {
pname = "obs-source-record";
version = "unstable-2022-11-10";
version = "0.3.2";
src = fetchFromGitHub {
owner = "exeldro";
repo = "obs-source-record";
rev = "4a543d3577d56a27f5f2b9aa541a466b37dafde0";
sha256 = "sha256-LoMgrWZ7r6lu2fisNvqrAiFvxWQQDE6lSxUHkMB/ZPY=";
rev = version;
sha256 = "sha256-H65uQ9HnKmHs52v3spG92ayeYH/TvmwcMoePMmBMqN8=";
};
patches = [
# fix obs 29.1 compatibility
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/exeldro/obs-source-record/pull/83.diff";
hash = "sha256-eWOjHHfoXZeoPtqvVyexSi/UQqHm8nu4FEEjma64Ly4=";
})
];
nativeBuildInputs = [ cmake ];
buildInputs = [
obs-studio
];
NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ];
cmakeFlags = [
"-DBUILD_OUT_OF_TREE=On"
];
@@ -285,9 +285,6 @@ in {
"--set NIM_CONFIG_PATH ${placeholder "out"}/etc/nim"
# Use the custom configuration
''--set NIX_HARDENING_ENABLE "''${NIX_HARDENING_ENABLE/fortify}"''
# Fortify hardening appends -O2 to gcc flags which is unwanted for unoptimized nim builds.
];
installPhase = ''
+2 -2
View File
@@ -1,6 +1,6 @@
{ mkDerivation }:
mkDerivation {
version = "25.3.2.4";
sha256 = "U0hzGrLcJZndCGXz/4b9yXy21QGXbKAtc01H1QnwO4A=";
version = "25.3.2.5";
sha256 = "fnyWyJ+QsaJk2/LK8jOuxZmt3AFXmeubdeoYSGid/0A=";
}
+2 -2
View File
@@ -40,13 +40,13 @@
stdenv.mkDerivation rec {
pname = "mlt";
version = "7.16.0";
version = "7.18.0";
src = fetchFromGitHub {
owner = "mltframework";
repo = "mlt";
rev = "v${version}";
hash = "sha256-Ed9CHaeJ8Rkrvfq/dZVOn/5lhHLH7B6A1Qf2xOQfWik=";
hash = "sha256-3qvMuBr2w/gedTDIjG6ezatleXuQSnKX4SkBShzj6aw=";
};
nativeBuildInputs = [
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "ngtcp2";
version = "0.15.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "ngtcp2";
repo = pname;
rev = "v${version}";
hash = "sha256-FWNWpRuCUyqTIyLZkBFKrd2urjSCqHp20mBAXOcJm14=";
hash = "sha256-vY3RooC8ttezru6vAqbG1MU5uZhD8fLnlEYVYS3pFRk=";
};
outputs = [ "out" "dev" "doc" ];
@@ -27,6 +27,13 @@ stdenv.mkDerivation rec {
"-DENABLE_STATIC_LIB=OFF"
];
preConfigure = ''
# https://github.com/ngtcp2/ngtcp2/issues/858
# Fix ngtcp2_crypto_openssl remnants.
substituteInPlace crypto/includes/CMakeLists.txt \
--replace 'ngtcp2/ngtcp2_crypto_openssl.h' 'ngtcp2/ngtcp2_crypto_quictls.h'
'';
doCheck = true;
enableParallelBuilding = true;
@@ -13,13 +13,13 @@ assert !blas.isILP64;
stdenv.mkDerivation rec {
pname = "simple-dftd3";
version = "0.7.0";
version = "1.0.0";
src = fetchFromGitHub {
owner = "dftd3";
repo = pname;
rev = "v${version}";
hash = "sha256-5OvmMgjD8ujjKHkuw4NT8hEXKh5YPxuBl/Mu6g2/KIA=";
hash = "sha256-dfXiKKCGJ69aExSKpVC3Bp//COy256R9PDyxCNmDsfo=";
};
nativeBuildInputs = [ cmake gfortran ];
@@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/gdraheim/zziplib/commit/e47b1e1da952a92f917db6fb19485b8a0b1a42f3.diff";
sha256 = "0d032hkmi3s3db12z2zbppl2swa3gdpbj0c6w13ylv2g2ixglrwg";
})
# Fixes invalid pointer conversions that cause compilation to fail with clang 15+
(fetchpatch {
url = "https://github.com/gdraheim/zziplib/commit/38e4d5f561318fa825e6544c2ef55ac5899c81b0.diff";
sha256 = "sha256-VJuFyiPhuAZlDxmNHBty+JbYwG85ea5u2sv7HZRHMwo=";
})
];
nativeBuildInputs = [
@@ -1,20 +1,20 @@
{ lib, buildNimPackage, fetchFromGitea, pkg-config, base32, coap, cbor
, freedesktop_org, illwill, syndicate, tkrzw }:
buildNimPackage rec {
buildNimPackage (final: prev: {
pname = "eris";
version = "20230716";
version = "20230722";
outputs = [ "bin" "out" ];
src = fetchFromGitea {
domain = "codeberg.org";
owner = "eris";
repo = "nim-${pname}";
rev = version;
hash = "sha256-g2mxua4++zqKeMbe98nBWh7/+rN/IElIiPcvyX0nfEY=";
repo = "nim-eris";
rev = final.version;
hash = "sha256-JVl2/PmFVYuD4s9hKoQwVDKUa3PBWK5SBDEmVHVSuig=";
};
propagatedNativeBuildInputs = [ pkg-config ];
propagatedBuildInputs =
[ base32 coap cbor freedesktop_org illwill syndicate tkrzw ];
[ base32 coap cbor freedesktop_org illwill tkrzw ];
postInstall = ''
mkdir -p "$bin/share/recoll/filters"
mv "$bin/bin/rclerislink" "$bin/share/recoll/filters/"
@@ -26,11 +26,11 @@ buildNimPackage rec {
install -D "eris-link.xml" -t "$bin/share/mime/packages"
install -D "eris48.png" "$bin/share/icons/hicolor/48x48/apps/eris.png"
'';
preCheck = "rm tests/test_syndicate.nim";
meta = src.meta // {
meta = final.src.meta // {
homepage = "https://codeberg.org/eris/nim-eris";
license = lib.licenses.unlicense;
maintainers = with lib.maintainers; [ ehmry ];
mainProgram = "eriscmd";
badPlatforms = lib.platforms.darwin;
};
}
})
@@ -1,8 +1,18 @@
{ fetchFromGitHub }:
{ lib, buildNimPackage, fetchFromGitHub }:
fetchFromGitHub {
owner = "jangko";
repo = "nim-noise";
rev = "v0.1.14";
sha256 = "0wndiphznfyb1pac6zysi3bqljwlfwj6ziarcwnpf00sw2zni449";
}
buildNimPackage (finalAttrs: {
pname = "noise";
version = "0.1.8";
src = fetchFromGitHub {
owner = "jangko";
repo = "nim-noise";
rev = "v${finalAttrs.version}";
sha256 = "sha256-QD7X1QTAKHYa2+QiYjrQq74CnEafwq/RsshlW2yZqmI=";
};
meta = finalAttrs.src.meta // {
description = "Nim implementation of linenoise";
homepage = "https://github.com/jangko/nim-noise";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ehmry ];
};
})
@@ -1,8 +1,20 @@
{ fetchFromGitHub }:
{ lib, buildNimPackage, fetchFromGitHub, unicodedb }:
fetchFromGitHub {
owner = "nitely";
repo = "nim-regex";
rev = "eeefb4f";
sha256 = "13gn0qhnxz07474kv94br5qlac9j8pz2555fk83538fiq83vgbm5";
}
buildNimPackage (finalAttrs: {
pname = "regex";
version = "0.20.2";
src = fetchFromGitHub {
owner = "nitely";
repo = "nim-regex";
rev = "v${finalAttrs.version}";
hash = "sha256-VViDf0uD6bj9WOO827NRbLUt+PgBPEmz/A/DDRCrHpc=";
};
propagatedBuildInputs = [ unicodedb ];
doCheck = false;
meta = finalAttrs.src.meta // {
description = "Pure Nim regex engine";
homepage = "https://github.com/nitely/nim-regex";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ehmry ];
};
})
@@ -1,8 +1,19 @@
{ fetchFromGitHub }:
{ lib, buildNimPackage, fetchFromGitHub, unicodedb }:
fetchFromGitHub {
owner = "nitely";
repo = "nim-segmentation";
rev = "v0.1.0";
sha256 = "007bkx8dwy8n340zbp6wyqfsq9bh6q5ykav1ywdlwykyp1n909bh";
}
buildNimPackage (finalAttrs: {
pname = "segmentation";
version = "0.1.0";
src = fetchFromGitHub {
owner = "nitely";
repo = "nim-segmentation";
rev = "v${finalAttrs.version}";
sha256 = "007bkx8dwy8n340zbp6wyqfsq9bh6q5ykav1ywdlwykyp1n909bh";
};
propagatedBuildInputs = [ unicodedb ];
meta = finalAttrs.src.meta // {
description = "Unicode text segmentation (tr29)";
homepage = "https://github.com/nitely/nim-segmentation";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ehmry ];
};
})
@@ -1,8 +1,18 @@
{ fetchFromGitHub }:
{ lib, buildNimPackage, fetchFromGitHub }:
fetchFromGitHub {
owner = "nitely";
repo = "nim-unicodedb";
rev = "v0.9.0";
sha256 = "06j8d0bjbpv1iibqlmrac4qb61ggv17hvh6nv4pbccqk1rlpxhsq";
}
buildNimPackage (finalAttrs: {
pname = "unicodedb";
version = "0.12.0";
src = fetchFromGitHub {
owner = "nitely";
repo = "nim-unicodedb";
rev = finalAttrs.version;
hash = "sha256-vtksdRTWH/Fjp1z8KSFGjgn1SRUxtUZwlOa+vMuB53A=";
};
meta = finalAttrs.src.meta // {
description = "Unicode Character Database (UCD, tr44) for Nim";
homepage = "https://github.com/nitely/nim-unicodedb";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ehmry ];
};
})
@@ -1,8 +1,19 @@
{ fetchFromGitHub }:
{ lib, buildNimPackage, fetchFromGitHub, segmentation }:
fetchFromGitHub {
owner = "nitely";
repo = "nim-unicodeplus";
rev = "v0.8.0";
sha256 = "181wzwivfgplkqn5r4crhnaqgsza7x6fi23i86djb2dxvm7v6qxk";
}
buildNimPackage (finalAttrs: {
pname = "unicodeplus";
version = "0.8.0";
src = fetchFromGitHub {
owner = "nitely";
repo = "nim-unicodeplus";
rev = "v${finalAttrs.version}";
sha256 = "181wzwivfgplkqn5r4crhnaqgsza7x6fi23i86djb2dxvm7v6qxk";
};
propagatedBuildInputs = [ segmentation ];
meta = finalAttrs.src.meta // {
description = "Common unicode operations";
homepage = "https://github.com/nitely/nim-unicodeplus";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ehmry ];
};
})
@@ -0,0 +1,21 @@
{ lib, buildNimPackage, fetchFromGitHub }:
buildNimPackage (finalAttrs: {
pname = "ws";
version = "0.5.0";
src = fetchFromGitHub {
owner = "treeform";
repo = "ws";
rev = finalAttrs.version;
hash = "sha256-3wVi6CjMTjcc5MJEozJN6W3TuYDb53w2MDCsv6lMH0k=";
};
preCheck = ''
rm tests/test_ws.nim tests/test_timeout.nim
'';
meta = finalAttrs.src.meta // {
description = "Simple WebSocket library for Nim";
homepage = "https://github.com/treeform/ws";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ehmry ];
};
})
@@ -2,13 +2,13 @@
buildDunePackage rec {
pname = "unix-errno";
version = "0.6.1";
version = "0.6.2";
minimalOCamlVersion = "4.03.0"; # Specified to be 4.01.0, but it's actually 4.03
src = fetchurl {
url = "https://github.com/xapi-project/ocaml-unix-errno/releases/download/${version}/unix-errno-${version}.tbz";
sha256 = "sha256-jZqtHwUKTffjuOP2jdKKQRtEOBKyclhfeiPO96hEj4c=";
sha256 = "sha256-LWqbyGcxs6f/FcOPo3JYR3U+AL0JHeWCiGjuYhxxrWU=";
};
propagatedBuildInputs = [ ctypes integers result ];
@@ -8,13 +8,13 @@ buildDunePackage rec {
minimalOCamlVersion = "4.08";
pname = "x509";
version = "0.16.4";
version = "0.16.5";
duneVersion = "3";
src = fetchurl {
url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-${version}.tbz";
hash = "sha256-XegxhdASQK/I7Xd0gJSLumTGbCYFpWsjR7PlZSWqaVo=";
hash = "sha256-FJ4lpf6jf2GfsmkL7lwA8BydzzHTNfj/yqs5p1OMzZk=";
};
checkInputs = [ alcotest cstruct-unix ];
@@ -0,0 +1,26 @@
https://github.com/gfx/p5-Data-Clone/pull/3
From 43102a83d15aedc61e5904eb5a6dab33c3c02b40 Mon Sep 17 00:00:00 2001
From: Yves Orton <demerphq@gmail.com>
Date: Thu, 9 Feb 2023 16:24:45 +0100
Subject: [PATCH] t/07_stack.t - isn't is deprecated, use isnt instead
As of 5.37.8 use of apostrophe for a package separator is deprecated,
and in 5.40 it will be removed entirely. Switch to isnt() instead
of isn't().
---
t/07_stack.t | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/07_stack.t b/t/07_stack.t
index 165e6a5..a750366 100644
--- a/t/07_stack.t
+++ b/t/07_stack.t
@@ -17,6 +17,6 @@ use Data::Clone;
my $before = bless [], Bar::;
my $after = clone($before);
-isn't $after, $before, 'stack reallocation during callback';
+isnt $after, $before, 'stack reallocation during callback';
done_testing;
@@ -0,0 +1,20 @@
smartmatch deprecated in perl-5.37.10
Patch by @pghmcfc from
https://github.com/dex4er/perl-Exception-Base/issues/5#issuecomment-1637075218
diff --git a/t/tlib/Exception/BaseTest.pm b/t/tlib/Exception/BaseTest.pm
index d590d12..e531ed7 100644
--- a/t/tlib/Exception/BaseTest.pm
+++ b/t/tlib/Exception/BaseTest.pm
@@ -569,8 +569,9 @@ sub test_overload {
$self->assert_matches(qr/String at /, $obj);
# smart matching for Perl 5.10
- if ($] >= 5.010) {
+ # Deprecation warning added in 5.37.10
+ if ($] >= 5.010 && $] < 5.037010) {
no if $] >= 5.018, warnings => 'experimental::smartmatch';
eval q{
$self->assert_num_equals(1, 'String' ~~ $obj);
@@ -0,0 +1,31 @@
https://rt.cpan.org/Public/Bug/Display.html?id=132995
From 94b5fc74c3d7ed835e83bac40632962af32f5b30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dagfinn=20Ilmari=20Manns=C3=A5ker?= <ilmari@ilmari.org>
Date: Mon, 13 Jul 2020 22:08:45 +0100
Subject: [PATCH] Fix indirect method call in ExtUtils::Constant test
It puts both "use $];" and "bootstrap $package \$VERSION;" in the
generated test module, which is going to break if we ever remove
`indirect` from the current feature bundle.
Fix by making the method call direct instead.
---
t/Constant.t | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/Constant.t b/t/Constant.t
index d6b45668da..526a32c779 100644
--- a/t/Constant.t
+++ b/t/Constant.t
@@ -435,7 +435,7 @@ EOT
print FH ");\n";
# Print the AUTOLOAD subroutine ExtUtils::Constant generated for us
print FH autoload ($package, $]);
- print FH "bootstrap $package \$VERSION;\n1;\n__END__\n";
+ print FH "$package->bootstrap(\$VERSION);\n1;\n__END__\n";
close FH or die "close $pm: $!\n";
################ test.pl
--
2.26.2
@@ -9,6 +9,8 @@ buildPythonPackage rec {
pname = "jsonmerge";
version = "1.9.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-xDdX4BgLDhm3rkwTCtQqB8xYDDGRL2H0gj6Ory+jlKM=";
@@ -18,11 +20,6 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
disabledTests = [
# Fails with "Unresolvable JSON pointer"
"test_local_reference_in_meta"
];
meta = with lib; {
description = "Merge a series of JSON documents";
homepage = "https://github.com/avian2/jsonmerge";
@@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "unstructured-inference";
version = "0.5.5";
version = "0.5.7";
format = "setuptools";
src = fetchFromGitHub {
owner = "Unstructured-IO";
repo = "unstructured-inference";
rev = version;
hash = "sha256-Oma6vPoiA+5czauYFgsU1W6UECDRurYmBTaCSiEILNs=";
rev = "refs/tags/${version}";
hash = "sha256-xlsihi1ZTNgdnSk3H8rMBRi4AAxPKNFqygcIMtM/jE0=";
};
postPatch = ''
@@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
pname = "jdt-language-server";
version = "1.21.0";
timestamp = "202303161431";
version = "1.26.0";
timestamp = "202307271613";
src = fetchurl {
url = "https://download.eclipse.org/jdtls/milestones/${version}/jdt-language-server-${version}-${timestamp}.tar.gz";
sha256 = "sha256-c8RDSvOgLbl05LDNelKgQXucbJnjJ7GVcut6mVT6GjA=";
sha256 = "sha256-ul/l7jsqg5UofiSu8gzm4Xg0z46HcRfmyqysamiKbFM=";
};
sourceRoot = ".";
@@ -15,16 +15,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "texlab";
version = "5.7.0";
version = "5.8.0";
src = fetchFromGitHub {
owner = "latex-lsp";
repo = "texlab";
rev = "refs/tags/v${version}";
hash = "sha256-GvORAPbQOdVpz4yY66b3OObewU98V26cZ6nrJ35nlkg=";
hash = "sha256-KjCE7ei01ks4TMYiHE9In2Z3AWOw/4D4kIl0vFA4YKs=";
};
cargoHash = "sha256-b7v3ODOjY5BQCzVqlLCNUOaZS95AvIvyjOeas2XfRjM=";
cargoHash = "sha256-1R9bNyNHDcRwn5nlkEFtSGA4V7Bn1Pq3v0E8njGUAYU=";
outputs = [ "out" ] ++ lib.optional (!isCross) "man";
@@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o
buildGoModule rec {
pname = "open-policy-agent";
version = "0.54.0";
version = "0.55.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "opa";
rev = "v${version}";
hash = "sha256-sMJ+mf6AR4qTx+nXk18ElFiPfymf/ZEoBJDZLGWtPUI=";
hash = "sha256-piQ8Cig2zG6UhzVbiDCTruAXNis8P5HUja4xiiol9jA=";
};
vendorHash = null;
+2 -2
View File
@@ -25,11 +25,11 @@ let
in
stdenv.mkDerivation rec {
pname = "unciv";
version = "4.7.8-patch1";
version = "4.7.11";
src = fetchurl {
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
hash = "sha256-y4mCv4bSz9hMGt/ZAAjbhF1tBy4l3r3GMi0jJr3mnVc=";
hash = "sha256-1QMfGONaw6XX3F2bo5tBghJbnii7z6RE+ZuanIGUF8Q=";
};
dontUnpack = true;
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "oven-media-engine";
version = "0.15.13";
version = "0.15.14";
src = fetchFromGitHub {
owner = "AirenSoft";
repo = "OvenMediaEngine";
rev = "v${version}";
sha256 = "sha256-CwWQg27i5CNbfFPhFx1bxS2XGH33OVq4sMhYIHgBHnQ=";
sha256 = "sha256-pLLnk0FXJ6gb0WSdWGEzJSEbKdOpjdWECIRzrHvi8HQ=";
};
sourceRoot = "source/src";
+3 -1
View File
@@ -2,6 +2,8 @@
, buildGoModule
, fetchFromGitHub
, nixosTests
, bash
, which
, ffmpeg
, makeBinaryWrapper
}:
@@ -25,7 +27,7 @@ in buildGoModule {
postInstall = ''
wrapProgram $out/bin/owncast \
--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
--prefix PATH : ${lib.makeBinPath [ bash which ffmpeg ]}
'';
installCheckPhase = ''
+3 -3
View File
@@ -6,17 +6,17 @@
buildGoModule rec {
pname = "goose";
version = "3.13.4";
version = "3.14.0";
src = fetchFromGitHub {
owner = "pressly";
repo = pname;
rev = "v${version}";
hash = "sha256-mz7kB8ygDm23bsuQy9mYnWSGF6DDGqBtvj82s2PLDR0=";
hash = "sha256-4WBYfxEmEuFZM+Qt2miw6GxuV5B2nc4XXeyDQi1IISg=";
};
proxyVendor = true;
vendorHash = "sha256-lWlv6+Auj9YGxyJXr5WGbe4AWqJSpHE9RTY+9ZXyPVQ=";
vendorHash = "sha256-zsqulNAPcGVp6+ClYtRwM5U6YwRak4ttSLbgPWDxtbI=";
# end-to-end tests require a docker daemon
postPatch = ''
+24 -17
View File
@@ -1,21 +1,28 @@
{ useLua ? true
, usePcre ? true
, withPrometheusExporter ? true
, stdenv, lib, fetchurl, nixosTests
, openssl, zlib, libxcrypt
, lua5_3 ? null, pcre ? null, systemd ? null
, stdenv
, lib
, fetchurl
, nixosTests
, openssl
, zlib
, libxcrypt
, lua5_3 ? null
, pcre ? null
, systemd ? null
}:
assert useLua -> lua5_3 != null;
assert usePcre -> pcre != null;
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "haproxy";
version = "2.8.1";
src = fetchurl {
url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
sha256 = "sha256-SFVS/NnV1fQarQRvEx/Ap+hJvvJaNJoEB1CvDG/FaAc=";
url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
hash = "sha256-SFVS/NnV1fQarQRvEx/Ap+hJvvJaNJoEB1CvDG/FaAc=";
};
buildInputs = [ openssl zlib libxcrypt ]
@@ -26,10 +33,10 @@ stdenv.mkDerivation rec {
# TODO: make it work on bsd as well
makeFlags = [
"PREFIX=${placeholder "out"}"
("TARGET=" + (if stdenv.isSunOS then "solaris"
else if stdenv.isLinux then "linux-glibc"
else if stdenv.isDarwin then "osx"
else "generic"))
("TARGET=" + (if stdenv.isSunOS then "solaris"
else if stdenv.isLinux then "linux-glibc"
else if stdenv.isDarwin then "osx"
else "generic"))
];
buildFlags = [
@@ -54,8 +61,11 @@ stdenv.mkDerivation rec {
passthru.tests.haproxy = nixosTests.haproxy;
meta = with lib; {
meta = {
changelog = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/CHANGELOG";
description = "Reliable, high performance TCP/HTTP load balancer";
homepage = "https://haproxy.org";
license = with lib.licenses; [ gpl2Plus lgpl21Only ];
longDescription = ''
HAProxy is a free, very fast and reliable solution offering high
availability, load balancing, and proxying for TCP and HTTP-based
@@ -64,10 +74,7 @@ stdenv.mkDerivation rec {
tens of thousands of connections is clearly realistic with todays
hardware.
'';
homepage = "https://haproxy.org";
changelog = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/CHANGELOG";
license = with licenses; [ gpl2Plus lgpl21Only ];
maintainers = with maintainers; [ ];
platforms = with platforms; linux ++ darwin;
maintainers = with lib.maintainers; [ ];
platforms = with lib.platforms; linux ++ darwin;
};
}
})
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "sequoia-sq";
version = "0.30.1";
version = "0.31.0";
src = fetchFromGitLab {
owner = "sequoia-pgp";
repo = "sequoia-sq";
rev = "v${version}";
hash = "sha256-uFcmuyz0JsUTvKqCb+3t8JdB4Dn4hJq00jeEhvMNW18=";
hash = "sha256-rrNN52tDM3CEGyNvsT3x4GmfWIpU8yoT2XsgOhPyLjo=";
};
cargoHash = "sha256-PWqwTGodQ7LBTgHFB2AWX5wIOVJja2GzPoocX59Dr/0=";
cargoHash = "sha256-B+gtUzUB99At+kusupsN/v6sCbpXs36/EbpTL3gUxnc=";
nativeBuildInputs = [
pkg-config
+2 -2
View File
@@ -30,11 +30,11 @@ let
in
stdenv.mkDerivation rec {
pname = "tor";
version = "0.4.7.13";
version = "0.4.7.14";
src = fetchurl {
url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
sha256 = "sha256-IHkXLM4DRVbxEASOJgg86b6nUfMVSwrSgJdRgVsR6p0=";
sha256 = "sha256-paxn9kZjgPwF6AQ9AcWB5Oiisi/glDABNHPnEGXmXfg=";
};
outputs = [ "out" "geoip" ];
+1
View File
@@ -21235,6 +21235,7 @@ with pkgs;
rev = "v${version}";
hash = "sha256-KzBMwpqn6wUFhgB3KDclBS0BvZSVcasM5AG/y+L91xM=";
};
patches = [];
};
libgit2-glib = callPackage ../development/libraries/libgit2-glib { };
+2
View File
@@ -132,6 +132,8 @@ lib.makeScope newScope (self:
vmath = callPackage ../development/nim-packages/vmath { };
ws = callPackage ../development/nim-packages/ws { };
x11 = callPackage ../development/nim-packages/x11 { };
zippy = callPackage ../development/nim-packages/zippy { };
+30 -21
View File
@@ -1565,11 +1565,11 @@ with self; {
BerkeleyDB = buildPerlPackage {
pname = "BerkeleyDB";
version = "0.64";
version = "0.65";
src = fetchurl {
url = "mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.64.tar.gz";
hash = "sha256-U1yF6FScGsQ6IBYP3ALwpABhQVb9dhV//yiqM/2jdEs=";
url = "mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.65.tar.gz";
hash = "sha256-QQqonnIylB1JEGyeBI1jN0dVQ+wdIz6nzbcly1uWNQQ=i";
};
preConfigure = ''
@@ -5515,10 +5515,10 @@ with self; {
CryptX = buildPerlPackage {
pname = "CryptX";
version = "0.076";
version = "0.078";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.076.tar.gz";
hash = "sha256-u4SsASQ4x87NtRpab/+08f7jsOrgAi6WzrwuFnUiYhw=";
url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.078.tar.gz";
hash = "sha256-kxYLEkL31XQ8s8kxuO/HyzmCHQ4y+U+Wkz8eiOYYvL0=";
};
meta = {
description = "Cryptographic toolkit";
@@ -5562,6 +5562,9 @@ with self; {
hash = "sha256-L+XheYgqa5Jt/vChCLSiyHof+waJK88vuI5Mj0uEODw=";
};
buildInputs = [ TestRequires ];
patches = [
../development/perl-modules/Data-Clone-fix-apostrophe-package-separator.patch
];
meta = {
description = "Polymorphic data cloning";
license = with lib.licenses; [ artistic1 gpl1Plus ];
@@ -6604,10 +6607,10 @@ with self; {
DevelCaller = buildPerlPackage {
pname = "Devel-Caller";
version = "2.06";
version = "2.07";
src = fetchurl {
url = "mirror://cpan/authors/id/R/RC/RCLAMP/Devel-Caller-2.06.tar.gz";
hash = "sha256-anOuaikoNCVbkNqUCSBUJTBfz+mUsUjcttLW72KNt98=";
url = "mirror://cpan/authors/id/R/RC/RCLAMP/Devel-Caller-2.07.tar.gz";
hash = "sha256-tnmisYA0sLcg3oLDcIckw2SxCmyhZMvGfNw68oPzUD8=";
};
propagatedBuildInputs = [ PadWalker ];
meta = {
@@ -7349,10 +7352,10 @@ with self; {
DevelFindPerl = buildPerlPackage {
pname = "Devel-FindPerl";
version = "0.015";
version = "0.016";
src = fetchurl {
url = "mirror://cpan/authors/id/L/LE/LEONT/Devel-FindPerl-0.015.tar.gz";
hash = "sha256-UnW33CJv5/Fstp/G+Z9eKahSxqTTt4arGIajE4Z0Pfw=";
url = "mirror://cpan/authors/id/L/LE/LEONT/Devel-FindPerl-0.016.tar.gz";
hash = "sha256-Q6K/L3h6PxuIEXkGMWKyqj58sET25eduxkZq6QqGETg=";
};
meta = {
description = "Find the path to your perl";
@@ -7403,10 +7406,10 @@ with self; {
DevelNYTProf = buildPerlPackage {
pname = "Devel-NYTProf";
version = "6.10";
version = "6.12";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JK/JKEENAN/Devel-NYTProf-6.10.tar.gz";
hash = "sha256-JKxBdPHwEyIGP6ThGbJH03HTJg3cpud4xsGg4/kF9Y4=";
url = "mirror://cpan/authors/id/J/JK/JKEENAN/Devel-NYTProf-6.12.tar.gz";
hash = "sha256-qDtZheTalr24X1McFqtvPUkHGnM80JSqMPqF+2pLAsQ=";
};
propagatedBuildInputs = [ FileWhich JSONMaybeXS ];
buildInputs = [ CaptureTiny TestDifferences ];
@@ -8668,6 +8671,9 @@ with self; {
hash = "sha256-VyPdePSsC00mKgXqRq9mPqANgJay6cCkNRXCEHYOHnU=";
};
buildInputs = [ TestUnitLite ];
patches = [
../development/perl-modules/Exception-Base-remove-smartmatch-when-5.38.0.patch
];
meta = {
description = "Lightweight exceptions";
license = with lib.licenses; [ artistic1 gpl1Plus ];
@@ -8823,6 +8829,9 @@ with self; {
url = "mirror://cpan/authors/id/N/NW/NWCLARK/ExtUtils-Constant-0.25.tar.gz";
hash = "sha256-aTPQ6WO2IoHvdWEGjmrsrIxKwrR2srugmrC5D7rJ11c=";
};
patches = [
../development/perl-modules/ExtUtils-Constant-fix-indirect-method-call-in-test.patch
];
meta = {
description = "Generate XS code to import C header constants";
license = with lib.licenses; [ artistic1 gpl1Plus ];
@@ -11276,10 +11285,10 @@ with self; {
HTMLMason = buildPerlPackage {
pname = "HTML-Mason";
version = "1.59";
version = "1.60";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.59.tar.gz";
hash = "sha256-lb7SpsSINwBGqjFL5LWSvWWmUi+IRdqLNqav+ai0OdA=";
url = "mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.60.tar.gz";
hash = "sha256-qgu9WmtjxiyJVfjFXsCF43DXktZSZrbDtcXweIu8d+Y=";
};
buildInputs = [ TestDeep ];
propagatedBuildInputs = [ CGI CacheCache ClassContainer ExceptionClass LogAny ];
@@ -14069,10 +14078,10 @@ with self; {
LogLog4perl = buildPerlPackage {
pname = "Log-Log4perl";
version = "1.53";
version = "1.57";
src = fetchurl {
url = "mirror://cpan/authors/id/E/ET/ETJ/Log-Log4perl-1.53.tar.gz";
hash = "sha256-j7+0jQFu7HNEpTnzrXCHC0rEY45JZmv6cNEPb/1Kw44=";
url = "mirror://cpan/authors/id/E/ET/ETJ/Log-Log4perl-1.57.tar.gz";
hash = "sha256-D4/Ldjio89tMeX35T9vFYBN0kULy+Uy8lbQ8n8oJahM=";
};
meta = {
description = "Log4j implementation for Perl";