mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-20 03:43:45 +00:00
Merge staging-next into staging
This commit is contained in:
commit
4c55b1cc5e
@ -322,6 +322,7 @@ with lib.maintainers; {
|
||||
|
||||
geospatial = {
|
||||
members = [
|
||||
das-g
|
||||
imincik
|
||||
nh2
|
||||
sikmir
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
@ -35,26 +35,18 @@ let
|
||||
|
||||
mkTable = { ipVer, dest, ipSet, forwardPorts, dmzHost }:
|
||||
let
|
||||
# nftables does not support both port and port range as values in a dnat map.
|
||||
# e.g. "dnat th dport map { 80 : 10.0.0.1 . 80, 443 : 10.0.0.2 . 900-1000 }"
|
||||
# So we split them.
|
||||
fwdPorts = filter (x: length (splitString "-" x.destination) == 1) forwardPorts;
|
||||
fwdPortsRange = filter (x: length (splitString "-" x.destination) > 1) forwardPorts;
|
||||
|
||||
# nftables maps for port forward
|
||||
# l4proto . dport : addr . port
|
||||
toFwdMap = forwardPorts: toNftSet (map
|
||||
fwdMap = toNftSet (map
|
||||
(fwd:
|
||||
with (splitIPPorts fwd.destination);
|
||||
"${fwd.proto} . ${toNftRange fwd.sourcePort} : ${IP} . ${ports}"
|
||||
)
|
||||
forwardPorts);
|
||||
fwdMap = toFwdMap fwdPorts;
|
||||
fwdRangeMap = toFwdMap fwdPortsRange;
|
||||
|
||||
# nftables maps for port forward loopback dnat
|
||||
# daddr . l4proto . dport : addr . port
|
||||
toFwdLoopDnatMap = forwardPorts: toNftSet (concatMap
|
||||
fwdLoopDnatMap = toNftSet (concatMap
|
||||
(fwd: map
|
||||
(loopbackip:
|
||||
with (splitIPPorts fwd.destination);
|
||||
@ -62,8 +54,6 @@ let
|
||||
)
|
||||
fwd.loopbackIPs)
|
||||
forwardPorts);
|
||||
fwdLoopDnatMap = toFwdLoopDnatMap fwdPorts;
|
||||
fwdLoopDnatRangeMap = toFwdLoopDnatMap fwdPortsRange;
|
||||
|
||||
# nftables set for port forward loopback snat
|
||||
# daddr . l4proto . dport
|
||||
@ -79,17 +69,11 @@ let
|
||||
type nat hook prerouting priority dstnat;
|
||||
|
||||
${optionalString (fwdMap != "") ''
|
||||
iifname "${cfg.externalInterface}" dnat meta l4proto . th dport map { ${fwdMap} } comment "port forward"
|
||||
''}
|
||||
${optionalString (fwdRangeMap != "") ''
|
||||
iifname "${cfg.externalInterface}" dnat meta l4proto . th dport map { ${fwdRangeMap} } comment "port forward"
|
||||
iifname "${cfg.externalInterface}" meta l4proto { tcp, udp } dnat meta l4proto . th dport map { ${fwdMap} } comment "port forward"
|
||||
''}
|
||||
|
||||
${optionalString (fwdLoopDnatMap != "") ''
|
||||
dnat ${ipVer} daddr . meta l4proto . th dport map { ${fwdLoopDnatMap} } comment "port forward loopback from other hosts behind NAT"
|
||||
''}
|
||||
${optionalString (fwdLoopDnatRangeMap != "") ''
|
||||
dnat ${ipVer} daddr . meta l4proto . th dport map { ${fwdLoopDnatRangeMap} } comment "port forward loopback from other hosts behind NAT"
|
||||
meta l4proto { tcp, udp } dnat ${ipVer} daddr . meta l4proto . th dport map { ${fwdLoopDnatMap} } comment "port forward loopback from other hosts behind NAT"
|
||||
''}
|
||||
|
||||
${optionalString (dmzHost != null) ''
|
||||
@ -116,10 +100,7 @@ let
|
||||
type nat hook output priority mangle;
|
||||
|
||||
${optionalString (fwdLoopDnatMap != "") ''
|
||||
dnat ${ipVer} daddr . meta l4proto . th dport map { ${fwdLoopDnatMap} } comment "port forward loopback from the host itself"
|
||||
''}
|
||||
${optionalString (fwdLoopDnatRangeMap != "") ''
|
||||
dnat ${ipVer} daddr . meta l4proto . th dport map { ${fwdLoopDnatRangeMap} } comment "port forward loopback from the host itself"
|
||||
meta l4proto { tcp, udp } dnat ${ipVer} daddr . meta l4proto . th dport map { ${fwdLoopDnatMap} } comment "port forward loopback from the host itself"
|
||||
''}
|
||||
}
|
||||
'';
|
||||
|
@ -5,12 +5,12 @@
|
||||
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
pname = "ledfx";
|
||||
version = "2.0.78";
|
||||
format = "setuptools";
|
||||
version = "2.0.80";
|
||||
pyproject= true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-IalfA/nfQrnE90ycOnPEZ4A/L8rwi08ECNA/8YxeAgQ=";
|
||||
hash = "sha256-vwLk3EpXqUSAwzY2oX0ZpXrmH2cT0GdYdL/Mifav6mU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -20,6 +20,10 @@ python3.pkgs.buildPythonPackage rec {
|
||||
--replace "~=" ">="
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
aiohttp
|
||||
aiohttp-cors
|
||||
|
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fulcrum";
|
||||
version = "1.9.3";
|
||||
version = "1.9.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cculianu";
|
||||
repo = "Fulcrum";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hSunoltau1eG0DDM/bxZ/ssxd7pbutNC34Nwtbu9Fqk=";
|
||||
sha256 = "sha256-EslrlnMgH6W/0q/P4H/o6n3zbBDNIGuNAFyGWcZBYL4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
|
@ -35,6 +35,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
setuptools
|
||||
sip_4 (pyqt5.override { withWebSockets = true; })
|
||||
truststore
|
||||
qt5.qtwayland
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
importlib-resources
|
||||
];
|
||||
|
@ -29,13 +29,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dssp";
|
||||
version = "4.4.4.1";
|
||||
version = "4.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PDB-REDO";
|
||||
repo = "dssp";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-sy6GBCnTGRD1YP00dKIolkr1RMboLGcd0f4kU8gCOnA=";
|
||||
hash = "sha256-X0aMWqoMhmQVRHWKVm2S6JAOYiBuBBMzMoivMdpNx0M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -195,6 +195,9 @@ stdenv.mkDerivation rec {
|
||||
"-Druntime_cxxmodules=OFF"
|
||||
];
|
||||
|
||||
# suppress warnings from compilation of the vendored clang to avoid running into log limits on the Hydra
|
||||
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-shadow" "-Wno-maybe-uninitialized" ];
|
||||
|
||||
# Workaround the xrootd runpath bug #169677 by prefixing [DY]LD_LIBRARY_PATH with ${lib.makeLibraryPath xrootd}.
|
||||
# TODO: Remove the [DY]LDLIBRARY_PATH prefix for xrootd when #200830 get merged.
|
||||
postInstall = ''
|
||||
|
@ -1,19 +1,21 @@
|
||||
{ lib, stdenvNoCC, fetchzip }:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub }:
|
||||
|
||||
let version = "0.91.12"; in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "open-dyslexic";
|
||||
version = "2016-06-23";
|
||||
inherit version;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/antijingoist/open-dyslexic/archive/20160623-Stable.zip";
|
||||
hash = "sha256-f/uavR3n0qHyqumZDw7r8Zy0om2RlJAKyWuGaUXSJ1s=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "antijingoist";
|
||||
repo = "opendyslexic";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-a8hh8NGt5djj9EC7ChO3SnnjuYMOryzbHWTK4gC/vIw=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 otf/*.otf -t $out/share/fonts/opentype
|
||||
install -Dm644 README.md -t $out/share/doc/open-dyslexic
|
||||
install -Dm644 compiled/*.otf -t $out/share/fonts/opentype
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
@ -21,7 +23,7 @@ stdenvNoCC.mkDerivation {
|
||||
meta = with lib; {
|
||||
homepage = "https://opendyslexic.org/";
|
||||
description = "Font created to increase readability for readers with dyslexia";
|
||||
license = "Bitstream Vera License (https://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts)";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
|
@ -18,25 +18,59 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "halide";
|
||||
version = "15.0.1";
|
||||
version = "16.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "halide";
|
||||
repo = "Halide";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mnZ6QMqDr48bH2W+andGZj2EhajXKApjuW6B50xtzx0=";
|
||||
sha256 = "sha256-lJQrXkJgBmGb/QMSxwuPkkHOSgEDowLWzIolp1km2Y8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# See https://github.com/halide/Halide/issues/7785
|
||||
substituteInPlace 'src/runtime/HalideRuntime.h' \
|
||||
--replace '#if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__)
|
||||
#define HALIDE_CPP_COMPILER_HAS_FLOAT16' \
|
||||
'#if defined(__x86_64__) || defined(__i386__)
|
||||
#define HALIDE_CPP_COMPILER_HAS_FLOAT16'
|
||||
''
|
||||
# Note: on x86_64-darwin, clang fails to find AvailabilityVersions.h, so we remove it.
|
||||
# Halide uses AvailabilityVersions.h and TargetConditionals.h to determine whether
|
||||
# ::aligned_alloc is available. For us, it isn't.
|
||||
+ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
|
||||
substituteInPlace 'src/runtime/HalideBuffer.h' \
|
||||
--replace '#ifdef __APPLE__
|
||||
#include <AvailabilityVersions.h>
|
||||
#include <TargetConditionals.h>
|
||||
#endif' \
|
||||
' ' \
|
||||
--replace 'TARGET_OS_OSX && (__MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_15)' \
|
||||
'1' \
|
||||
--replace 'TARGET_OS_IPHONE && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_14_0)' \
|
||||
'0'
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DWARNINGS_AS_ERRORS=OFF"
|
||||
"-DWITH_PYTHON_BINDINGS=OFF"
|
||||
"-DTARGET_WEBASSEMBLY=OFF"
|
||||
# Disable performance tests since they may fail on busy machines
|
||||
"-DWITH_TEST_PERFORMANCE=OFF"
|
||||
# Disable fuzzing tests -- this has become the default upstream after the
|
||||
# v16 release (See https://github.com/halide/Halide/commit/09c5d1d19ec8e6280ccbc01a8a12decfb27226ba)
|
||||
# These tests also fail to compile on Darwin because of some missing command line options...
|
||||
"-DWITH_TEST_FUZZ=OFF"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# Note: disable mullapudi2016_fibonacci because it requires too much
|
||||
# parallelism for remote builders
|
||||
preCheck = ''
|
||||
checkFlagsArray+=("ARGS=-E 'mullapudi2016_fibonacci'")
|
||||
'';
|
||||
|
||||
# Note: only openblas and not atlas part of this Nix expression
|
||||
# see pkgs/development/libraries/science/math/liblapack/3.5.0.nix
|
||||
# to get a hint howto setup atlas instead of openblas
|
||||
|
@ -308,7 +308,7 @@ qtModule {
|
||||
|
||||
meta = with lib; {
|
||||
description = "A web engine based on the Chromium web browser";
|
||||
platforms = platforms.unix;
|
||||
platforms = [ "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7a-linux" "armv7l-linux" "x86_64-linux" ];
|
||||
# This build takes a long time; particularly on slow architectures
|
||||
# 1 hour on 32x3.6GHz -> maybe 12 hours on 4x2.4GHz
|
||||
timeout = 24 * 3600;
|
||||
|
@ -6,11 +6,15 @@
|
||||
, python3
|
||||
, blas
|
||||
, lapack
|
||||
, mpiSupport ? true
|
||||
, mpi # generic mpi dependency
|
||||
, openssh # required for openmpi tests
|
||||
, petsc-withp4est ? true
|
||||
, petsc-withp4est ? false
|
||||
, p4est
|
||||
, zlib # propagated by p4est but required by petsc
|
||||
, petsc-optimized ? false
|
||||
, petsc-scalar-type ? "real"
|
||||
, petsc-precision ? "double"
|
||||
}:
|
||||
|
||||
# This version of PETSc does not support a non-MPI p4est build
|
||||
@ -18,14 +22,14 @@ assert petsc-withp4est -> p4est.mpiSupport;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "petsc";
|
||||
version = "3.19.2";
|
||||
version = "3.19.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz";
|
||||
sha256 = "sha256-EU82P3ebsWg5slwOcPiwrg2UfVDnL3xs3csRsAEHmxY=";
|
||||
sha256 = "sha256-fJQbcb5Sw7dkIU5JLfYBCdEvl/fYVMl6RN8MTZWLOQY=";
|
||||
};
|
||||
|
||||
mpiSupport = !withp4est || p4est.mpiSupport;
|
||||
inherit mpiSupport;
|
||||
withp4est = petsc-withp4est;
|
||||
|
||||
strictDeps = true;
|
||||
@ -49,7 +53,6 @@ stdenv.mkDerivation rec {
|
||||
patches = [ ./filter_mpi_warnings.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
export FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran"
|
||||
patchShebangs ./lib/petsc/bin
|
||||
configureFlagsArray=(
|
||||
$configureFlagsArray
|
||||
@ -68,6 +71,14 @@ stdenv.mkDerivation rec {
|
||||
''}
|
||||
"--with-blas=1"
|
||||
"--with-lapack=1"
|
||||
"--with-scalar-type=${petsc-scalar-type}"
|
||||
"--with-precision=${petsc-precision}"
|
||||
${lib.optionalString petsc-optimized ''
|
||||
"--with-debugging=0"
|
||||
COPTFLAGS='-g -O3'
|
||||
FOPTFLAGS='-g -O3'
|
||||
CXXOPTFLAGS='-g -O3'
|
||||
''}
|
||||
)
|
||||
'';
|
||||
|
||||
|
@ -6,7 +6,7 @@ index 168febb34b6..71068469066 100644
|
||||
# these tests are used by the makefile in PETSC_DIR for basic tests of the install and should not be removed
|
||||
testex5f: ex5f.PETSc
|
||||
-@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex5f -snes_rtol 1e-4 > ex5f_1.tmp 2>&1; \
|
||||
+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \
|
||||
+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \
|
||||
if (${DIFF} output/ex5f_1.testout ex5f_1.tmp > /dev/null 2>&1) then \
|
||||
echo "Fortran example src/snes/tutorials/ex5f run successfully with 1 MPI process"; \
|
||||
else \
|
||||
@ -14,7 +14,7 @@ index 168febb34b6..71068469066 100644
|
||||
${MAKE} PETSC_ARCH=${PETSC_ARCH} PETSC_DIR=${PETSC_DIR} ex5f.rm;
|
||||
testex19: ex19.PETSc
|
||||
-@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \
|
||||
+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
|
||||
+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
|
||||
if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \
|
||||
echo "C/C++ example src/snes/tutorials/ex19 run successfully with 1 MPI process"; \
|
||||
else \
|
||||
@ -22,7 +22,7 @@ index 168febb34b6..71068469066 100644
|
||||
${RM} -f ex19_1.tmp;
|
||||
testex19_mpi:
|
||||
-@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \
|
||||
+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
|
||||
+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
|
||||
if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \
|
||||
echo "C/C++ example src/snes/tutorials/ex19 run successfully with 2 MPI processes"; \
|
||||
else \
|
||||
@ -30,7 +30,7 @@ index 168febb34b6..71068469066 100644
|
||||
#use unpreconditioned norm because HYPRE device installations use different AMG parameters
|
||||
runex19_hypre:
|
||||
-@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \
|
||||
+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
|
||||
+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
|
||||
if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \
|
||||
echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre"; \
|
||||
else \
|
||||
@ -38,7 +38,7 @@ index 168febb34b6..71068469066 100644
|
||||
${RM} -f ex19_1.tmp
|
||||
runex19_hypre_cuda:
|
||||
-@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type cuda -dm_mat_type aijcusparse -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \
|
||||
+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
|
||||
+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
|
||||
if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \
|
||||
echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre/cuda"; \
|
||||
else \
|
||||
@ -46,7 +46,7 @@ index 168febb34b6..71068469066 100644
|
||||
${RM} -f ex19_1.tmp
|
||||
runex19_hypre_hip:
|
||||
-@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type hip -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \
|
||||
+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
|
||||
+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
|
||||
if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \
|
||||
echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre/hip"; \
|
||||
else \
|
||||
@ -54,7 +54,7 @@ index 168febb34b6..71068469066 100644
|
||||
${RM} -f ex19_1.tmp
|
||||
runex19_cuda:
|
||||
-@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -snes_monitor -dm_mat_type seqaijcusparse -dm_vec_type seqcuda -pc_type gamg -pc_gamg_esteig_ksp_max_it 10 -ksp_monitor -mg_levels_ksp_max_it 3 > ex19_1.tmp 2>&1; \
|
||||
+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
|
||||
+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
|
||||
if (${DIFF} output/ex19_cuda_1.out ex19_1.tmp) then \
|
||||
echo "C/C++ example src/snes/tutorials/ex19 run successfully with cuda"; \
|
||||
else \
|
||||
@ -62,7 +62,7 @@ index 168febb34b6..71068469066 100644
|
||||
${RM} -f ex19_1.tmp
|
||||
runex19_ml:
|
||||
-@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type ml > ex19_1.tmp 2>&1; \
|
||||
+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
|
||||
+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
|
||||
if (${DIFF} output/ex19_ml.out ex19_1.tmp) then \
|
||||
echo "C/C++ example src/snes/tutorials/ex19 run successfully with ml"; \
|
||||
else \
|
||||
@ -70,7 +70,7 @@ index 168febb34b6..71068469066 100644
|
||||
${RM} -f ex19_1.tmp
|
||||
runex19_fieldsplit_mumps:
|
||||
-@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -pc_type fieldsplit -pc_fieldsplit_block_size 4 -pc_fieldsplit_type SCHUR -pc_fieldsplit_0_fields 0,1,2 -pc_fieldsplit_1_fields 3 -fieldsplit_0_pc_type lu -fieldsplit_1_pc_type lu -snes_monitor_short -ksp_monitor_short -fieldsplit_0_pc_factor_mat_solver_type mumps -fieldsplit_1_pc_factor_mat_solver_type mumps > ex19_6.tmp 2>&1; \
|
||||
+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_6.tmp; \
|
||||
+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_6.tmp; \
|
||||
if (${DIFF} output/ex19_fieldsplit_5.out ex19_6.tmp) then \
|
||||
echo "C/C++ example src/snes/tutorials/ex19 run successfully with mumps"; \
|
||||
else \
|
||||
@ -78,7 +78,7 @@ index 168febb34b6..71068469066 100644
|
||||
${RM} -f ex19_6.tmp
|
||||
runex19_superlu_dist:
|
||||
-@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_grid_x 20 -da_grid_y 20 -pc_type lu -pc_factor_mat_solver_type superlu_dist > ex19.tmp 2>&1; \
|
||||
+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19.tmp; \
|
||||
+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19.tmp; \
|
||||
if (${DIFF} output/ex19_superlu.out ex19.tmp) then \
|
||||
echo "C/C++ example src/snes/tutorials/ex19 run successfully with superlu_dist"; \
|
||||
else \
|
||||
@ -86,7 +86,7 @@ index 168febb34b6..71068469066 100644
|
||||
${RM} -f ex19.tmp
|
||||
runex19_suitesparse:
|
||||
-@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type lu -pc_factor_mat_solver_type umfpack > ex19_1.tmp 2>&1; \
|
||||
+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
|
||||
+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
|
||||
if (${DIFF} output/ex19_suitesparse.out ex19_1.tmp) then \
|
||||
echo "C/C++ example src/snes/tutorials/ex19 run successfully with suitesparse"; \
|
||||
else \
|
||||
@ -94,7 +94,7 @@ index 168febb34b6..71068469066 100644
|
||||
${RM} -f ex19_1.tmp
|
||||
runex3k_kokkos: ex3k.PETSc
|
||||
-@OMP_PROC_BIND=false ${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex3k -view_initial -dm_vec_type kokkos -dm_mat_type aijkokkos -use_gpu_aware_mpi 0 -snes_monitor > ex3k_1.tmp 2>&1 ;\
|
||||
+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \
|
||||
+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \
|
||||
if (${DIFF} output/ex3k_1.out ex3k_1.tmp) then \
|
||||
echo "C/C++ example src/snes/tutorials/ex3k run successfully with kokkos-kernels"; \
|
||||
else \
|
||||
|
@ -0,0 +1,26 @@
|
||||
{ lib, fetchPypi, python3, ...}:
|
||||
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
pname = "aiohttp_client_cache";
|
||||
version = "0.10.0";
|
||||
pyproject = true;
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-FXU4QNqa8B8ZADmoEyJfd8gsUDI0HEjIR9B2CBP55wU=";
|
||||
};
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
];
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
aiohttp
|
||||
attrs
|
||||
itsdangerous
|
||||
url-normalize
|
||||
];
|
||||
meta = with lib; {
|
||||
description = "An async persistent cache for aiohttp requests";
|
||||
homepage = "https://pypi.org/project/aiohttp-client-cache/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ seirl ];
|
||||
};
|
||||
}
|
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioshelly";
|
||||
version = "6.0.0";
|
||||
version = "6.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "home-assistant-libs";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-mB9BEVqbHcoUaygIgrtqk20wMJkL+dWpbeyG5VP4+sg=";
|
||||
hash = "sha256-LkcUcGx31GwrbmBWCyEuD5x9yzeszUHBCYSBgTzgz9A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiounifi";
|
||||
version = "65";
|
||||
version = "66";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "Kane610";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VpDtr5r7BxZDd8G8tPrHRVo+LRhsFoMlVUuOcG/3g0s=";
|
||||
hash = "sha256-UWKsx7giGrNR04X/2vgdaCFulxbzQkvlRfCEodVoHY8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-containerservice";
|
||||
version = "27.0.0";
|
||||
version = "28.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-IdGo2A65YiMJJ8S18Ji+FfnnylNhs8vFOQpfA91wgNM=";
|
||||
hash = "sha256-tVYFpEUV9v0OOk3CK/oPRA8+fhYl668Gqz6wa/NabNs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gcal-sync";
|
||||
version = "6.0.1";
|
||||
version = "6.0.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "allenporter";
|
||||
repo = "gcal_sync";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-8ye15xn6h2YOMQTC1iJtY05WXe4bKyOn3tvPfNdS3y0=";
|
||||
hash = "sha256-i5K4kJcieugPkXIuDje8tk5TEX6EwDywUB6MByLmukA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -13,21 +13,24 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-speech";
|
||||
version = "2.21.1";
|
||||
format = "setuptools";
|
||||
version = "2.22.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-STU3XqrxhlblPiYxdwudV56Ay07Bs9Rt0jNG94mqAWo=";
|
||||
hash = "sha256-lZKKiYaS1+qgVWbVeiE464tbkjSxw8y3LFUgce0qOrA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
google-api-core
|
||||
proto-plus
|
||||
protobuf
|
||||
setuptools
|
||||
] ++ google-api-core.optional-dependencies.grpc;
|
||||
|
||||
nativeCheckInputs = [
|
||||
@ -36,10 +39,9 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Requrire credentials
|
||||
"tests/system/gapic/v1/test_system_speech_v1.py"
|
||||
"tests/system/gapic/v1p1beta1/test_system_speech_v1p1beta1.py"
|
||||
disabledTests = [
|
||||
# Test requires project ID
|
||||
"test_list_phrase_set"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
@ -50,8 +52,8 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Google Cloud Speech API client library";
|
||||
homepage = "https://github.com/googleapis/python-speech";
|
||||
changelog = "https://github.com/googleapis/python-speech/blob/v${version}/CHANGELOG.md";
|
||||
homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-speech";
|
||||
changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-speech-v${version}/packages/google-cloud-speech/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
@ -1,28 +1,27 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, aiohttp
|
||||
, yarl
|
||||
, aresponses
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, yarl
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gridnet";
|
||||
version = "4.3.0";
|
||||
version = "5.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "klaasnicolaas";
|
||||
repo = "python-gridnet";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8R8vPVL1Iq0NneN8G2bjUOrEq96LW9Zk5RcWG/LSJTY=";
|
||||
hash = "sha256-7tLT5sRoUjWs1DOIuUEbnJJkg9LHZqrN/eu+Mjx5Yd4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -46,11 +45,14 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "gridnet" ];
|
||||
pythonImportsCheck = [
|
||||
"gridnet"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Asynchronous Python client for NET2GRID devices";
|
||||
homepage = "https://github.com/klaasnicolaas/python-gridnet";
|
||||
changelog = "https://github.com/klaasnicolaas/python-gridnet/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "humanize";
|
||||
version = "4.8.0";
|
||||
version = "4.9.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "python-humanize";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-bKTzygQtZ/0UB+zM9735a/xwH4KaoU6C8kUGurbHs2Y=";
|
||||
hash = "sha256-sLlgR6c65RmUNZdH2pHuxzo7dm71uUZXGqzcqyxCrk4=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
@ -12,16 +12,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "odp-amsterdam";
|
||||
version = "5.3.1";
|
||||
format = "pyproject";
|
||||
version = "6.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "klaasnicolaas";
|
||||
repo = "python-odp-amsterdam";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-HesAg6hJ8Al/ZZRBTXZM0EVv1kjYmmA66W+crwtWhf4=";
|
||||
hash = "sha256-dAyKypc8bMWkXhYa7BlGGAGqPaPJHFHwXd/UK80BGoE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -12,18 +12,24 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "p1monitor";
|
||||
version = "2.3.1";
|
||||
format = "pyproject";
|
||||
version = "3.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "klaasnicolaas";
|
||||
repo = "python-p1monitor";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-2NlFXeI+6ooh4D1OxUWwYrmM4zpL9gg8vhnseLjj2dM=";
|
||||
hash = "sha256-ZtIY4HvRllqlLlf3j1+RMJuuQuq+BZbMuMn9n/v8H5M=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace '"0.0.0"' '"${version}"' \
|
||||
--replace 'addopts = "--cov"' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
@ -39,12 +45,6 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace '"0.0.0"' '"${version}"' \
|
||||
--replace 'addopts = "--cov"' ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"p1monitor"
|
||||
];
|
||||
|
@ -9,6 +9,7 @@
|
||||
, lzip
|
||||
, zpaq
|
||||
, gnutar
|
||||
, unar # Free alternative to unrar
|
||||
, gnugrep
|
||||
, diffutils
|
||||
, file
|
||||
@ -17,13 +18,11 @@
|
||||
, xz
|
||||
}:
|
||||
|
||||
# unrar is unfree, as well as 7z with unrar support, not including it (patool doesn't support unar)
|
||||
# it will still use unrar if present in the path
|
||||
|
||||
let
|
||||
compression-utilities = [
|
||||
p7zip
|
||||
gnutar
|
||||
unar
|
||||
cabextract
|
||||
zip
|
||||
lzip
|
||||
@ -38,7 +37,7 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "patool";
|
||||
version = "1.12";
|
||||
version = "2.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
#pypi doesn't have test data
|
||||
@ -46,24 +45,9 @@ buildPythonPackage rec {
|
||||
owner = "wummel";
|
||||
repo = pname;
|
||||
rev = "upstream/${version}";
|
||||
hash = "sha256-Xv4aCUnLi+b1T29tuKRADTIWwK2dO8iDP/D7UfU5mWw=";
|
||||
hash = "sha256-Hjpifsi5Q1eoe/MFWuQBDyjoXi/aUG4VN84yNMkAZaE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/wummel/patool/pull/63
|
||||
(fetchpatch {
|
||||
name = "apk-sometimes-has-mime-jar.patch";
|
||||
url = "https://github.com/wummel/patool/commit/a9f3ee3d639a1065be024001e89c0b153511b16b.patch";
|
||||
hash = "sha256-a4aWqHHc/cBs5T2QKZ08ky1K1tqKZEgqVmTmV11aTVE=";
|
||||
})
|
||||
# https://github.com/wummel/patool/pull/130
|
||||
(fetchpatch {
|
||||
name = "apk-sometimes-has-mime-android-package.patch";
|
||||
url = "https://github.com/wummel/patool/commit/e8a1eea1d273b278a1b6f5029d2e21cb18bc9ffd.patch";
|
||||
hash = "sha256-AVooVdU4FNIixUfwyrn39N2SDFHNs4CUYzS5Eey+DrU=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace patoolib/util.py \
|
||||
--replace "path = None" 'path = os.environ["PATH"] + ":${lib.makeBinPath compression-utilities}"'
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scmrepo";
|
||||
version = "1.4.1";
|
||||
version = "1.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ZK3M689vv3Kr2OoNdxaCs9Spo6h6xJmhTsPajKHYtkA=";
|
||||
hash = "sha256-eEK2U1gTw3PP7kt2lNjiEs8yZX9Cmty0LIgZqg7FsJc=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
@ -41,7 +41,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sentry-sdk";
|
||||
version = "1.36.0";
|
||||
version = "1.37.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -50,7 +50,7 @@ buildPythonPackage rec {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-4NncvZtBwAyMkfZBm44IubFA+f2bXrGy5HOYr70SoSg=";
|
||||
hash = "sha256-y1fZe3ql8twSsTl24bP0fqA6myMv71I6IgzOVucbuvM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "slack-sdk";
|
||||
version = "3.24.0";
|
||||
version = "3.26.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "slackapi";
|
||||
repo = "python-slack-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Euea7O2CYapTAlK+PZEuyGhVdpT/N44rFGSRvPiJyNs=";
|
||||
hash = "sha256-jvLzZFlR2msyCc9C7WvYpXIGoKCDRxJI5lgNUtbGh/w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "slackclient";
|
||||
version = "3.23.0";
|
||||
version = "3.26.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "slackapi";
|
||||
repo = "python-slack-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-OsPwLOnmN3kvPmbM6lOaiTWwWvy7b9pgn1X536dCkWk=";
|
||||
hash = "sha256-jvLzZFlR2msyCc9C7WvYpXIGoKCDRxJI5lgNUtbGh/w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yeelight";
|
||||
version = "0.7.13";
|
||||
version = "0.7.14";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "stavros";
|
||||
repo = "python-yeelight";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-IhEvyWgOTAlfQH1MX7GCpaJUJOGY/ZNbyk5Q6CiTDLA=";
|
||||
hash = "sha256-BnMvRs95rsmoBa/5bp0zShgU1BBHtZzyADjbH0y1d/o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flit-core ];
|
||||
|
@ -3,9 +3,7 @@
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, Cocoa
|
||||
, CoreServices
|
||||
, Foundation
|
||||
, libiconv
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@ -21,7 +19,9 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoHash = "sha256-0D+aM/zap5UDQ+k9c/p+ZfN1OUjDzFRArvcmqEOcBbM=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Cocoa CoreServices Foundation libiconv ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Foundation Cocoa ];
|
||||
|
||||
NIX_LDFLAGS = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "-framework" "AppKit" ];
|
||||
|
||||
# `test with_cargo` tries to call cargo-watch as a cargo subcommand
|
||||
# (calling cargo-watch with command `cargo watch`)
|
||||
|
@ -2,6 +2,7 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, glib
|
||||
, json-glib
|
||||
, meson
|
||||
, ninja
|
||||
, pantheon
|
||||
@ -14,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vala-lint";
|
||||
version = "unstable-2023-05-25";
|
||||
version = "unstable-2023-11-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vala-lang";
|
||||
repo = "vala-lint";
|
||||
rev = "4d21b8a2be8b77052176d06d0cf10a8b319117c4";
|
||||
sha256 = "sha256-OnBeiYm83XjAezHEBEA2LvJ5ErVOyKclXJcS0cYaLIg=";
|
||||
rev = "95cf9e61a73fe4a0f69fd8c275c9548703f79838";
|
||||
sha256 = "sha256-w5jW/JM1sR9gIIVl3WJNK9jpaA4CMr56Wt4AuxUlkW8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -34,8 +35,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
json-glib
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/vala-lang/vala-lint/issues/181
|
||||
substituteInPlace test/meson.build \
|
||||
--replace "test('auto-fix', auto_fix_test, env: test_envars)" ""
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru = {
|
||||
|
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jitsi-meet-prosody";
|
||||
version = "1.0.7531";
|
||||
version = "1.0.7629";
|
||||
src = fetchurl {
|
||||
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
||||
sha256 = "ppRjUhx/VBkbFNhQunaUfOnwckOqJRQUTVMhKYZ0StU=";
|
||||
sha256 = "4D/E/TS1tyIoTOQ23LctBFbUyvFvsrr2ivvfEbMbAfc=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
@ -2,10 +2,10 @@
|
||||
|
||||
let
|
||||
pname = "jitsi-videobridge2";
|
||||
version = "2.3-44-g8983b11f";
|
||||
version = "2.3-59-g5c48e421";
|
||||
src = fetchurl {
|
||||
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
||||
sha256 = "TUWACKQz4wEGv2VKqKsuQLjtJZr24gtVZ4l7LCXe7VE=";
|
||||
sha256 = "yFFvdDOdG6/VloQV4VWBr2rv7dh7dNiL6D4cep2QIxE=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "uptime-kuma";
|
||||
version = "1.23.6";
|
||||
version = "1.23.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "louislam";
|
||||
repo = "uptime-kuma";
|
||||
rev = version;
|
||||
hash = "sha256-E/iyusAZnEnfXQ63LZA+9dgE0MvhFOKmrIXCEZ+LGi8=";
|
||||
hash = "sha256-XAtXfrsm9nWWOFJSbL/wWRgzmr2as9J/Y0SwPC0f65o=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-AeN6+0DKd+Q2g3I960PeL3IBla5S7X0od9J244HiwLU=";
|
||||
npmDepsHash = "sha256-ZAAHvpUBIj2TDGvzkfAEonQrX3AkEbaAL/pap5Q9j7c=";
|
||||
|
||||
patches = [
|
||||
# Fixes the permissions of the database being not set correctly
|
||||
|
@ -6,7 +6,7 @@
|
||||
, fetchYarnDeps
|
||||
, nixosTests
|
||||
, brotli
|
||||
, fixup_yarn_lock
|
||||
, prefetch-yarn-deps
|
||||
, jq
|
||||
, nodejs
|
||||
, which
|
||||
@ -69,14 +69,14 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-Ejzk/VEx7YtJpsrkHcXAZnJ+yRx1VhBJGpqquHYULNU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ brotli fixup_yarn_lock jq nodejs which yarn ];
|
||||
nativeBuildInputs = [ brotli prefetch-yarn-deps jq nodejs which yarn ];
|
||||
|
||||
buildPhase = ''
|
||||
# Build node modules
|
||||
export HOME=$PWD
|
||||
fixup_yarn_lock ~/yarn.lock
|
||||
fixup_yarn_lock ~/server/tools/yarn.lock
|
||||
fixup_yarn_lock ~/client/yarn.lock
|
||||
fixup-yarn-lock ~/yarn.lock
|
||||
fixup-yarn-lock ~/server/tools/yarn.lock
|
||||
fixup-yarn-lock ~/client/yarn.lock
|
||||
yarn config --offline set yarn-offline-mirror $yarnOfflineCacheServer
|
||||
yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress
|
||||
cd ~/server/tools
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pg_auto_failover";
|
||||
version = "2.0";
|
||||
version = "2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "citusdata";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CLtLOzKRB9p6+SytMvWCYo7m7s/d+clAGOa2sWi6uZ0=";
|
||||
sha256 = "sha256-OIWykfFbVskrkPG/zSmZtZjc+W956KSfIzK7f5QOqpI=";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql openssl zlib readline libkrb5 ]
|
||||
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "PostgreSQL extension and service for automated failover and high-availability";
|
||||
homepage = "https://github.com/citusdata/pg_auto_failover";
|
||||
changelog = "https://github.com/citusdata/pg_auto_failover/raw/v${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/citusdata/pg_auto_failover/blob/v${version}/CHANGELOG.md";
|
||||
maintainers = [ maintainers.marsam ];
|
||||
platforms = postgresql.meta.platforms;
|
||||
license = licenses.postgresql;
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jitsi-meet";
|
||||
version = "1.0.7531";
|
||||
version = "1.0.7629";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2";
|
||||
sha256 = "lSntX5MRnp0GuimiqYGiBwi5wI62omvAN1ioyIz+Upc=";
|
||||
sha256 = "v2KCpq/x8Zo3+KvhC4t8YnxPtBMP6vS4JeXmXZc62zc=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mapcidr";
|
||||
version = "1.1.14";
|
||||
version = "1.1.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Vhh/OS61dfArsowXMogr/bu/gg354nte9PuobD9lCaU=";
|
||||
hash = "sha256-O0HVlrLOz4+hxhf/BTSZs0qDCbYokbzmg5KbzUD1UHg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wqbAOoRQEE7CDmaH5MRzsSKOdyrxwBY/1wDz3MCfsBc=";
|
||||
vendorHash = "sha256-j/3Z2KxbybJoE6/PXkwMLivzmTnZSi7tgO8IQKCoaEQ=";
|
||||
|
||||
modRoot = ".";
|
||||
subPackages = [
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2023-11-21";
|
||||
version = "2023-11-24";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-kRw9djRYFC88EG3bf+sY0ERUBEnqUvXudatG1nuHREg=";
|
||||
hash = "sha256-qSJ4ZmgOR36CcCVFneYZhgFysxsa/nySdiypveuX8Fw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -6,15 +6,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubesec";
|
||||
version = "2.13.0";
|
||||
version = "2.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "controlplaneio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9WhY1mJawMkSgqM50DO0y9bxGYW89N14gLirO5zVuzc=";
|
||||
sha256 = "sha256-RNLvmoHna5EO0/p24opBagyWzzNbmFkWGzkUXirdWe0=";
|
||||
};
|
||||
vendorHash = "sha256-xcIFveR0MwpYGYhHKXwQPHF08620yilEtb+BdKZWrdw=";
|
||||
vendorHash = "sha256-+Y5k9PRxnBR3lqi4T+3DH4Pw+cyHtt9+9OX4aw0CVl0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
@ -9,9 +9,14 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-OFPreVhLqPvieoFUJbZan38Vsljg1DoFqFa9t11YiuQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's/void main/int main/' *.c
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
sed -e 's,/usr/local/bin/perl,${perl}/bin/perl,' \
|
||||
-e "s,/usr/local,$out," \
|
||||
-e "s,CFLAGS =,CFLAGS = -std=c89," \
|
||||
Makefile.unix > Makefile
|
||||
'';
|
||||
|
||||
|
@ -9123,7 +9123,7 @@ with pkgs;
|
||||
halibut = callPackage ../tools/typesetting/halibut { };
|
||||
|
||||
halide = callPackage ../development/compilers/halide {
|
||||
llvmPackages = llvmPackages_14;
|
||||
llvmPackages = llvmPackages_16;
|
||||
};
|
||||
|
||||
harePackages = recurseIntoAttrs (callPackage ./hare-packages.nix { });
|
||||
@ -17148,8 +17148,8 @@ with pkgs;
|
||||
cargo-wasi = callPackage ../development/tools/rust/cargo-wasi {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
cargo-watch = darwin.apple_sdk_11_0.callPackage ../development/tools/rust/cargo-watch {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreServices Foundation;
|
||||
cargo-watch = callPackage ../development/tools/rust/cargo-watch {
|
||||
inherit (darwin.apple_sdk.frameworks) Foundation Cocoa;
|
||||
};
|
||||
cargo-wipe = callPackage ../development/tools/rust/cargo-wipe { };
|
||||
cargo-workspaces = callPackage ../development/tools/rust/cargo-workspaces { };
|
||||
|
@ -228,6 +228,8 @@ self: super: with self; {
|
||||
|
||||
aiohttp-basicauth = callPackage ../development/python-modules/aiohttp-basicauth { };
|
||||
|
||||
aiohttp-client-cache = callPackage ../development/python-modules/aiohttp-client-cache { };
|
||||
|
||||
aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { };
|
||||
|
||||
aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { };
|
||||
|
Loading…
Reference in New Issue
Block a user