mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 04:49:01 +02:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
627bec113e
|
|
@ -20,7 +20,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "4.3.2";
|
||||
version = "4.3.3";
|
||||
|
||||
libsecp256k1_name =
|
||||
if stdenv.isLinux then "libsecp256k1.so.0"
|
||||
|
|
@ -37,7 +37,7 @@ let
|
|||
owner = "spesmilo";
|
||||
repo = "electrum";
|
||||
rev = version;
|
||||
sha256 = "sha256-z2/UamKmBq/5a0PTbHdAqGK617Lc8xRhHRpbCc7jeZo=";
|
||||
sha256 = "sha256-40GfOKBTAi8RAsAVrG9rv1Jr5IqM+1yro6YYRsSULxw=";
|
||||
|
||||
postFetch = ''
|
||||
mv $out ./all
|
||||
|
|
@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
|
||||
sha256 = "sha256-vTZArTwbKcf6/vPQOvjubPecsg+h+QlZ6rdbl6qNfs0=";
|
||||
sha256 = "sha256-NPXGfbEjT9l88ZnGbDcE3+oGxThTzW7YfesBzssGsbc=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
|
|
|||
|
|
@ -149,11 +149,11 @@
|
|||
},
|
||||
"baiducloud": {
|
||||
"deleteVendor": true,
|
||||
"hash": "sha256-MwpFSUhAZ6TjqWfsy7qazBtd1CrLbsAIDyRLonsDXiM=",
|
||||
"hash": "sha256-g3+n0Q0Hl4yRaYK0snl4um5B5FS54Y6aMM7LeluPik4=",
|
||||
"homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
|
||||
"owner": "baidubce",
|
||||
"repo": "terraform-provider-baiducloud",
|
||||
"rev": "v1.19.1",
|
||||
"rev": "v1.19.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-3PLBs8LSE5JPtrhmdx+jQsnCrfZQQEUGA7wnf9M72yY="
|
||||
},
|
||||
|
|
@ -424,11 +424,11 @@
|
|||
"vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk="
|
||||
},
|
||||
"github": {
|
||||
"hash": "sha256-o7Sge0rCfP6Yueq+DP7siBsEinawgGe+nEu0/Olu8uQ=",
|
||||
"hash": "sha256-foPj/zLJJx3mI1PpDwcThptT5EprEDfakUWRsjaa0nc=",
|
||||
"homepage": "https://registry.terraform.io/providers/integrations/github",
|
||||
"owner": "integrations",
|
||||
"repo": "terraform-provider-github",
|
||||
"rev": "v5.12.0",
|
||||
"rev": "v5.13.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "haruna";
|
||||
version = "0.9.3";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "multimedia";
|
||||
repo = "haruna";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JINvLmiS6EnkAmxbqPJI+J9Wk4+ZXwZZm1x5Ew7FCBg=";
|
||||
hash = "sha256-UU8tbaZz7udDulh+PHPZDc3rm1MvK4dafPgXL50apMI=";
|
||||
domain = "invent.kde.org";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osinfo-db";
|
||||
version = "20220830";
|
||||
version = "20221130";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-gRFkPZDeq4ONt/IT8VS+8uBXNQqcg0JF7gHdZEM7qvs=";
|
||||
sha256 = "sha256-opVMrXob7yZ5lJmHxjiI8eCBsJ4R+3JQVDcvA37HcX8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.7.19";
|
||||
version = "3.7.20";
|
||||
pname = "afflib";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sshock";
|
||||
repo = "AFFLIBv3";
|
||||
rev = "v${version}";
|
||||
sha256 = "1qs843yi33yqbp0scqirn753lxzg762rz6xy2h3f8f77fijqj2qb";
|
||||
sha256 = "sha256-xkqBfTftzn+rgeuoaKfHP7vQmy4VZuaCq8VFlfZTUE4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, cmake, ogre, freetype, boost, expat }:
|
||||
{ lib, stdenv, fetchurl, cmake, ogre, freetype, boost, expat, libiconv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cegui";
|
||||
|
|
@ -10,12 +10,15 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ ogre freetype boost expat ];
|
||||
buildInputs = [ ogre freetype boost expat ]
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
cmakeFlags = lib.optional (stdenv.isDarwin && stdenv.isAarch64) "-DCMAKE_OSX_ARCHITECTURES=arm64";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://cegui.org.uk/";
|
||||
description = "C++ Library for creating GUIs";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,50 +1,110 @@
|
|||
{ fetchurl, stdenv, lib
|
||||
, cmake, libGLU, libGL
|
||||
, freetype, freeimage, zziplib, xorgproto, libXrandr
|
||||
, libXaw, freeglut, libXt, libpng, boost, ois
|
||||
, libX11, libXmu, libSM, pkg-config
|
||||
, libXxf86vm, libICE
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, boost
|
||||
, freeimage
|
||||
, freetype
|
||||
, libpng
|
||||
, ois
|
||||
, zziplib
|
||||
, freeglut
|
||||
, libGL
|
||||
, libGLU
|
||||
, libICE
|
||||
, libSM
|
||||
, libX11
|
||||
, libXaw
|
||||
, libXmu
|
||||
, libXrandr
|
||||
, libXrender
|
||||
, withNvidiaCg ? false, nvidia_cg_toolkit
|
||||
, withSamples ? false }:
|
||||
, libXt
|
||||
, libXxf86vm
|
||||
, xorgproto
|
||||
, darwin
|
||||
, withNvidiaCg ? false
|
||||
, nvidia_cg_toolkit
|
||||
, withSamples ? false
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (darwin.apple_sdk.frameworks) AGL Cocoa;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ogre";
|
||||
version = "1.10.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/sinbad/ogre/get/v${lib.replaceStrings ["."] ["-"] version}.tar.gz";
|
||||
sha256 = "1zwvlx5dz9nwjazhnrhzb0w8ilpa84r0hrxrmmy69pgr1p1yif5a";
|
||||
url = "https://bitbucket.org/sinbad/ogre/get/v${lib.replaceStrings ["."] ["-"] version}.tar.gz";
|
||||
sha256 = "1zwvlx5dz9nwjazhnrhzb0w8ilpa84r0hrxrmmy69pgr1p1yif5a";
|
||||
};
|
||||
|
||||
# fix for ARM. sys/sysctl.h has moved in later glibcs, and
|
||||
# https://github.com/OGRECave/ogre-next/issues/132 suggests it isn't
|
||||
# needed anyway.
|
||||
postPatch = ''
|
||||
substituteInPlace OgreMain/src/OgrePlatformInformation.cpp \
|
||||
--replace '#include <sys/sysctl.h>' ""
|
||||
'';
|
||||
patches = [
|
||||
# aarch64-darwin support
|
||||
(fetchpatch {
|
||||
url = "https://github.com/OGRECave/ogre/commit/bd5fbe3482c56e58c6c3b3bf439b1eab8c1be258.patch";
|
||||
includes = [ "OgreMain/include/OgrePlatform*.h" ];
|
||||
sha256 = "sha256-ELeCklQkltz7DeDaGl78Jk1H3Wdfu8fMUiMZaJM4s/Y=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/OGRECave/ogre/commit/0873244cc06b613ca2afbcb5522fe9ef89f111c5.patch";
|
||||
sha256 = "sha256-xGvlMB55B2rdthxNMIM5iFf9p/6zuE8bGL9P04qtweQ=";
|
||||
})
|
||||
# aarch64-linux support
|
||||
(fetchpatch {
|
||||
name = "fix-build-on-aarch64-linux.patch";
|
||||
url = "https://github.com/OGRECave/ogre/commit/8ec086e9bc2e24fab373b514c572483b69071d69.patch";
|
||||
sha256 = "sha256-22wlJPZ7lRIPAMqvpI/2YI0neQjGi1UXt8y5zNSpxCw=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ]
|
||||
++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on")
|
||||
([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")
|
||||
++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs =
|
||||
[ libGLU libGL
|
||||
freetype freeimage zziplib xorgproto libXrandr
|
||||
libXaw freeglut libXt libpng boost ois
|
||||
libX11 libXmu libSM
|
||||
libXxf86vm libICE
|
||||
libXrender
|
||||
] ++ lib.optional withNvidiaCg nvidia_cg_toolkit;
|
||||
buildInputs = [
|
||||
boost
|
||||
freeimage
|
||||
freetype
|
||||
libpng
|
||||
ois
|
||||
zziplib
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
freeglut
|
||||
libGL
|
||||
libGLU
|
||||
libICE
|
||||
libSM
|
||||
libX11
|
||||
libXaw
|
||||
libXmu
|
||||
libXrandr
|
||||
libXrender
|
||||
libXt
|
||||
libXxf86vm
|
||||
xorgproto
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
AGL
|
||||
Cocoa
|
||||
] ++ lib.optionals withNvidiaCg [
|
||||
nvidia_cg_toolkit
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE"
|
||||
"-DOGRE_BUILD_SAMPLES=${toString withSamples}"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A 3D engine";
|
||||
description = "3D Object-Oriented Graphics Rendering Engine";
|
||||
homepage = "https://www.ogre3d.org/";
|
||||
maintainers = [ lib.maintainers.raskin ];
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ raskin wegank ];
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,25 +1,25 @@
|
|||
{ lib, fetchurl, buildDunePackage, stdlib-shims, ounit }:
|
||||
{ lib, fetchurl, ocaml, buildDunePackage, seq, stdlib-shims, ounit2 }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "fileutils";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/gildor478/ocaml-fileutils/releases/download/v${version}/fileutils-v${version}.tbz";
|
||||
sha256 = "0qhlhc7fzcq0yfg1wyszsi0gyc4w9hyzmfv84aq9wc79i3283xgg";
|
||||
url = "https://github.com/gildor478/ocaml-fileutils/releases/download/v${version}/fileutils-${version}.tbz";
|
||||
hash = "sha256-enu2vGo2tuvawrTkap6bENNmxaLUQXpfHWih+7oKRF8=";
|
||||
};
|
||||
|
||||
minimumOCamlVersion = "4.03";
|
||||
useDune2 = true;
|
||||
minimalOCamlVersion = "4.03";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
seq
|
||||
stdlib-shims
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
ounit
|
||||
ounit2
|
||||
];
|
||||
doCheck = true;
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.04";
|
||||
|
||||
meta = with lib; {
|
||||
description = "OCaml API to manipulate real files (POSIX like) and filenames";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ailment";
|
||||
version = "9.2.31";
|
||||
version = "9.2.32";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jG7lZet15mp1ltbdcv1ZMHHa+ydFXQiNS+dl70tmluE=";
|
||||
hash = "sha256-JHKF1uTzAzYrVx1iOtOjJYFbnvFeTzUjTmm24leHIMs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "angr";
|
||||
version = "9.2.31";
|
||||
version = "9.2.32";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -40,7 +40,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-i7kIHDg1iCtEeigS2+4MTS2fmUYYEbruL7q0s1skR9k=";
|
||||
hash = "sha256-nyFEyOo4qtkyjAmkOV0JEOKAKWJKwjRrywKqP2yoJ54=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "archinfo";
|
||||
version = "9.2.31";
|
||||
version = "9.2.32";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mrsEdVUp13XqVwrbLYbR8vAsu5wPHQcIOBBSmSPJQYY=";
|
||||
hash = "sha256-LChk65iM238jB1jwgEis5Wfz8YGmb9UCOdmQcU+3bFA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "claripy";
|
||||
version = "9.2.31";
|
||||
version = "9.2.32";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hIzB6E1z3ufbHFoe2IfBTuF4uuJibaFTqDjTf5ubHDU=";
|
||||
hash = "sha256-Cf56Q2ZqBq3uoCGqG5pYxA6ANP8VLC6pAMZIL5ubq30=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
let
|
||||
# The binaries are following the argr projects release cycle
|
||||
version = "9.2.31";
|
||||
version = "9.2.32";
|
||||
|
||||
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
||||
binaries = fetchFromGitHub {
|
||||
|
|
@ -38,7 +38,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZgM1GEsmp6LOoFf33l6cZY6cyCoitPDEpFbAVuAd0p8=";
|
||||
hash = "sha256-KYWhwL3DAa/2Hb4I1NfYWA5gXrwEeMpDpAWCWGLqFeE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,30 +1,47 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "geniushub-client";
|
||||
version = "0.6.30";
|
||||
version = "0.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "390932b6e5051e221d104b2683d9deb6e352172c4ec4eeede0954bf2f9680211";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "manzanotti";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-amsMZjCsPI8CUfSct4uumn8nVZDESlQFh19LXu3yb7o=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'VERSION = os.environ["GITHUB_REF_NAME"]' "" \
|
||||
--replace "version=VERSION," 'version="${version}",'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
];
|
||||
|
||||
# tests only implemented after 0.6.30
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "geniushubclient" ];
|
||||
pythonImportsCheck = [
|
||||
"geniushubclient"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Aiohttp-based client for Genius Hub systems";
|
||||
homepage = "https://github.com/zxdavb/geniushub-client";
|
||||
description = "Module to interact with Genius Hub systems";
|
||||
homepage = "https://github.com/manzanotti/geniushub-client";
|
||||
changelog = "https://github.com/manzanotti/geniushub-client/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -47,8 +47,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "mitmproxy";
|
||||
repo = "mitmproxy";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-nW/WfiY6uF67qNa95tvNvSv/alP2WmzTk34LEBma/04=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-CINKvRnBspciS+wefJB8gzBE13L8CjbYCkmLmTTeYlA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -110,6 +110,10 @@ buildPythonPackage rec {
|
|||
"test_flowview"
|
||||
# ValueError: Exceeds the limit (4300) for integer string conversion
|
||||
"test_roundtrip_big_integer"
|
||||
|
||||
"test_wireguard"
|
||||
"test_commands_exist"
|
||||
"test_statusbar"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyatmo";
|
||||
version = "7.4.0";
|
||||
version = "7.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "jabesq";
|
||||
repo = "pyatmo";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-0AgmH0cxXPUBzC30HyX68WsSyYsDcPaVQHLOIsZbHzI=";
|
||||
hash = "sha256-GucatimZTg0Fggrz4bG1x6YSa3wE/uLGB4ufil/km3w=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
@ -62,6 +62,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Simple API to access Netatmo weather station data";
|
||||
homepage = "https://github.com/jabesq/pyatmo";
|
||||
changelog = "https://github.com/jabesq/pyatmo/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ delroth ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvex";
|
||||
version = "9.2.31";
|
||||
version = "9.2.32";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Te0wFz+3/HVKlMXW5WJ6mRGh8wWiMXR6Ypi/4hvnz/8=";
|
||||
hash = "sha256-5ZCFAEHcM+3yH9pFyrduG8Uo1Ofr4JkvcXjJEi5KRMc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "qtawesome";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "spyder-ide";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-KcYCXrTP8ED5j/VTLTw7a8zotDSqIu9ultmwp8Ip5nM=";
|
||||
hash = "sha256-zXwIwYG76aCKPTE8mGiAOK8kQUCzJbqnjJszmIqByaA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -40,6 +40,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Iconic fonts in PyQt and PySide applications";
|
||||
homepage = "https://github.com/spyder-ide/qtawesome";
|
||||
changelog = "https://github.com/spyder-ide/qtawesome/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux; # fails on Darwin
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "zha-quirks";
|
||||
version = "0.0.89";
|
||||
version = "0.0.90";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "zigpy";
|
||||
repo = "zha-device-handlers";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5qSznGO3Cke+lGPLHjzh/db5O0/Ypmd6D5MTHuiox6Q=";
|
||||
hash = "sha256-SfzwS7M821uGfbOLR37iiw+gEebKDgu1H7f0fs3J9kw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clickhouse";
|
||||
version = "22.8.5.29";
|
||||
version = "22.8.11.15";
|
||||
|
||||
broken = stdenv.buildPlatform.is32bit; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
repo = "ClickHouse";
|
||||
rev = "v${version}-lts";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-JRdZb5YgaumTnjJEYIXh9o3NSv67DAdl9gizVKvGTJI=";
|
||||
sha256 = "sha256-ZFS7RgeTV/eMSiI0o9WO1fHjRkPDNZs0Gm3w+blGsz0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake libtool llvm-bintools ninja ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wordpress";
|
||||
version = "6.0.3";
|
||||
version = "6.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://wordpress.org/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-eSi0qwzXoJ1wYUzi34s7QbBbwRm2hfXoyGFivhPBq5o=";
|
||||
sha256 = "sha256-IR6FSmm3Pd8cCHNQTH1oIaLYsEP1obVjr0bDJkD7H60=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Licensed under: MIT
|
||||
# Slightly modified
|
||||
|
||||
{ lib, newScope, plugins, themes, languages }:
|
||||
{ lib, newScope, plugins, themes, languages, callPackage }:
|
||||
|
||||
let packages = self:
|
||||
let
|
||||
|
|
@ -82,4 +82,4 @@ let packages = self:
|
|||
} // lib.mapAttrs (type: pkgs: lib.makeExtensible (_: lib.mapAttrs (pname: data: self.mkOfficialWordpressDerivation { type = lib.removeSuffix "s" type; inherit pname data; }) pkgs)) generatedJson;
|
||||
|
||||
# This creates an extensible scope.
|
||||
in (lib.makeExtensible (_: (lib.makeScope newScope packages))).extend (selfWP: superWP: {})
|
||||
in lib.recursiveUpdate ((lib.makeExtensible (_: (lib.makeScope newScope packages))).extend (selfWP: superWP: {})) (callPackage ./thirdparty.nix {})
|
||||
|
|
|
|||
|
|
@ -72,10 +72,10 @@
|
|||
"version": "5.0.18"
|
||||
},
|
||||
"mailpoet": {
|
||||
"path": "mailpoet/tags/4.3.0",
|
||||
"rev": "2836720",
|
||||
"sha256": "0igaq34gq5ysk5ai39b641kx7rqsj052m6r55zl6z7xjpxhf37aw",
|
||||
"version": "4.3.0"
|
||||
"path": "mailpoet/tags/4.3.1",
|
||||
"rev": "2843001",
|
||||
"sha256": "0nnmfk1rxhf31makfc0v7mlh30799saxpf8agqdlavrmqpvypvzb",
|
||||
"version": "4.3.1"
|
||||
},
|
||||
"merge-minify-refresh": {
|
||||
"path": "merge-minify-refresh/trunk",
|
||||
|
|
@ -150,15 +150,21 @@
|
|||
"version": "3.7.0"
|
||||
},
|
||||
"wp-statistics": {
|
||||
"path": "wp-statistics/tags/13.2.10",
|
||||
"rev": "2838980",
|
||||
"sha256": "02wg8y4zfx0h87k38dy21gfys1g99r4dswwv6g308vflcml68ma1",
|
||||
"version": "13.2.10"
|
||||
"path": "wp-statistics/tags/13.2.11",
|
||||
"rev": "2841966",
|
||||
"sha256": "0bdg63q9wq82rpj7lxiwsvbpxa03r2v1pngs2pxifd4632b7ikni",
|
||||
"version": "13.2.11"
|
||||
},
|
||||
"wp-user-avatars": {
|
||||
"path": "wp-user-avatars/trunk",
|
||||
"rev": "2540784",
|
||||
"sha256": "1g21nl6xs9zyq0ainjwa06wl90975l8f9rj0fa20zkmw17w2mdgl",
|
||||
"version": "1.4.1"
|
||||
},
|
||||
"wpforms-lite": {
|
||||
"path": "wpforms-lite/tags/1.7.8",
|
||||
"rev": "2815943",
|
||||
"sha256": "0xqnjxlj2m6zpcasj3gksg9qzjm8pynjr8sar8xbgfz8ichs5m6m",
|
||||
"version": "1.7.8"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
8
pkgs/servers/web-apps/wordpress/packages/thirdparty.nix
Normal file
8
pkgs/servers/web-apps/wordpress/packages/thirdparty.nix
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
{fetchzip}: {
|
||||
plugins.civicrm = fetchzip rec {
|
||||
name = "civicrm";
|
||||
version = "5.56.0";
|
||||
url = "https://storage.googleapis.com/${name}/${name}-stable/${version}/${name}-${version}-wordpress.zip";
|
||||
hash = "sha256-XsNFxVL0LF+OHlsqjjTV41x9ERLwMDq9BnKKP3Px2aI=";
|
||||
};
|
||||
}
|
||||
|
|
@ -26,4 +26,5 @@
|
|||
, "wp-mail-smtp"
|
||||
, "wp-statistics"
|
||||
, "wp-user-avatars"
|
||||
, "wpforms-lite"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -34,13 +34,14 @@ in stdenv.mkDerivation rec {
|
|||
tgtpy="$out/lib/${python.libPrefix}/site-packages"
|
||||
mkdir -p "$tgtpy"
|
||||
export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy"
|
||||
find po4a scripts -type f -exec sed -r \
|
||||
find lib po4a scripts -type f -exec sed -r \
|
||||
-e "s@/usr/bin/gpg(2|)@${gnupg}/bin/gpg@g" \
|
||||
-e "s@/usr/(s|)bin/sendmail@${sendmailPath}@g" \
|
||||
-e "s@/usr/bin/diff@${diffutils}/bin/diff@g" \
|
||||
-e "s@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv@g" \
|
||||
-e "s@(command -v|/usr/bin/)curl@${curl.bin}/bin/curl@g" \
|
||||
-e "s@sensible-editor@${sensible-editor}@g" \
|
||||
-e "s@(^|\W)/bin/bash@\1${stdenv.shell}@g" \
|
||||
-i {} +
|
||||
sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile
|
||||
sed -r \
|
||||
|
|
@ -66,6 +67,9 @@ in stdenv.mkDerivation rec {
|
|||
--prefix PYTHONPATH : "$out/${python.sitePackages}" \
|
||||
--prefix PATH : "${dpkg}/bin"
|
||||
done
|
||||
ln -s cvs-debi $out/bin/cvs-debc
|
||||
ln -s debchange $out/bin/dch
|
||||
ln -s pts-subscribe $out/bin/pts-unsubscribe
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,16 +1,26 @@
|
|||
{ lib, stdenv, fetchurl, fping, rrdtool, perlPackages, nixosTests }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, fping, rrdtool, perlPackages, autoreconfHook, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "smokeping";
|
||||
version = "2.6.11";
|
||||
version = "2.8.2";
|
||||
src = fetchurl {
|
||||
url = "https://oss.oetiker.ch/smokeping/pub/smokeping-${version}.tar.gz";
|
||||
sha256 = "1p9hpa2zs33p7hzrds80kwrm5255s0869v3s3qmsyx2sx63c7czj";
|
||||
sha256 = "sha256-KeYRGLRV4juWmtpfjiq0MtPi74fUr+LIbeSgPXGItuo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://src.fedoraproject.org/rpms/smokeping/raw/4ebf1921706a5a29c758fdce2f59cc35652c944a/f/smokeping-2.8.2-no-3rd-party.patch";
|
||||
hash = "sha256-97rQ4m9HHl3lIpQyjZvu+gZSrNIB2pckxmopCQAQPp0=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ rrdtool ] ++
|
||||
(with perlPackages; [ perl FCGI CGI CGIFast ConfigGrammar DigestHMAC NetTelnet
|
||||
NetOpenSSH NetSNMP LWP IOTty fping NetDNS perlldap ]);
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/htdocs/smokeping.fcgi.dist $out/htdocs/smokeping.fcgi
|
||||
'';
|
||||
|
|
@ -19,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
description = "Network latency collector";
|
||||
homepage = "http://oss.oetiker.ch/smokeping";
|
||||
homepage = "https://oss.oetiker.ch/smokeping";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ lib.maintainers.erictapen ];
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
let
|
||||
pname = "pass-checkup";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
in stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
|
|
@ -11,7 +11,7 @@ in stdenv.mkDerivation {
|
|||
owner = "etu";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "18b6rx59r7g0hvqs2affvw0g0jyifyzhanwgz2q2b8nhjgqgnar2";
|
||||
sha256 = "1p65yxr00k35g4bnagszp8i03pmhnrcmipgrdsawps2ba8faqp6r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ shellcheck ];
|
||||
|
|
|
|||
|
|
@ -16366,6 +16366,8 @@ with pkgs;
|
|||
|
||||
pipenv = callPackage ../development/tools/pipenv {};
|
||||
|
||||
pipx = with python3.pkgs; toPythonApplication pipx;
|
||||
|
||||
pipewire = callPackage ../development/libraries/pipewire {
|
||||
# ffmpeg depends on SDL2 which depends on pipewire by default.
|
||||
# Break the cycle by depending on ffmpeg-headless.
|
||||
|
|
@ -23932,9 +23934,9 @@ with pkgs;
|
|||
|
||||
clickhouse = callPackage ../servers/clickhouse {
|
||||
# upstream requires llvm12 as of v22.3.2.2
|
||||
inherit (llvmPackages_13) clang-unwrapped lld llvm;
|
||||
llvm-bintools = llvmPackages_13.bintools;
|
||||
stdenv = llvmPackages_13.stdenv;
|
||||
inherit (llvmPackages_14) clang-unwrapped lld llvm;
|
||||
llvm-bintools = llvmPackages_14.bintools;
|
||||
stdenv = llvmPackages_14.stdenv;
|
||||
};
|
||||
|
||||
clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli;
|
||||
|
|
|
|||
Loading…
Reference in a new issue