Merge staging-next into staging
This commit is contained in:
github-actions[bot]
@@ -2,7 +2,7 @@
|
||||
, zlib, jdk, glib, glib-networking, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk
|
||||
, makeWrapper, perl, ... }:
|
||||
|
||||
{ name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description, productVersion }:
|
||||
{ name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit name src;
|
||||
@@ -38,13 +38,14 @@ stdenv.mkDerivation rec {
|
||||
# settings in ~/.eclipse/org.eclipse.platform_<version> rather
|
||||
# than ~/.eclipse/org.eclipse.platform_<version>_<number>.
|
||||
productId=$(sed 's/id=//; t; d' $out/eclipse/.eclipseproduct)
|
||||
productVersion=$(sed 's/version=//; t; d' $out/eclipse/.eclipseproduct)
|
||||
|
||||
makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
|
||||
--prefix PATH : ${jdk}/bin \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst libsecret ] ++ lib.optional (webkitgtk != null) webkitgtk)} \
|
||||
--prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
|
||||
--add-flags "-configuration \$HOME/.eclipse/''${productId}_${productVersion}/configuration"
|
||||
--add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"
|
||||
|
||||
# Create desktop item.
|
||||
mkdir -p $out/share/applications
|
||||
|
||||
@@ -14,21 +14,19 @@
|
||||
|
||||
let
|
||||
platform_major = "4";
|
||||
platform_minor = "25";
|
||||
platform_minor = "26";
|
||||
year = "2022";
|
||||
month = "09"; #release month
|
||||
buildmonth = "08"; #sometimes differs from release month
|
||||
timestamp = "${year}${buildmonth}311800";
|
||||
month = "12"; #release month
|
||||
buildmonth = "11"; #sometimes differs from release month
|
||||
timestamp = "${year}${buildmonth}231800";
|
||||
gtk = gtk3;
|
||||
in rec {
|
||||
|
||||
# work around https://bugs.eclipse.org/bugs/show_bug.cgi?id=476075#c3
|
||||
buildEclipseUnversioned = callPackage ./build-eclipse.nix {
|
||||
buildEclipse = callPackage ./build-eclipse.nix {
|
||||
inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib
|
||||
jdk glib gtk libXtst gsettings-desktop-schemas webkitgtk
|
||||
makeWrapper;
|
||||
};
|
||||
buildEclipse = eclipseData: buildEclipseUnversioned (eclipseData // { productVersion = "${platform_major}.${platform_minor}"; });
|
||||
|
||||
### Eclipse CPP
|
||||
|
||||
@@ -38,7 +36,7 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-1sUQ/jDOQMqnKLKY6oh28STvS5pbH89+2zs+H77euiJOsBgB+yEkEntnhI39O67qmOK/EkQ3y3NkQcumbax56A==";
|
||||
hash = "sha512-nqqY4dewq1bjeNoZdWvOez+cBti+f9qXshx1eqJ2lB7sGJva5mcR9e+CZTVD0+EtVJ/U+8viJ+E1Veht1ZnqOw==";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -50,7 +48,7 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-Qb2BmfXtmVeTLIZZav91hayPkwSGYMAG3fod3BmyJdo1DPas6VC+MzBwklAjpC1wqLTzKCAKzVZtdtPYC9QCqw==";
|
||||
hash = "sha512-WU2BJt6GL3ug3yOUOd5y6/AbGLcr2MkCg+QJiNIMkSXvoU9TF6R6oimoGVc3kPZmazRy6WYoes55T3bWrHnO8Q==";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -62,17 +60,16 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-RW+5H82AcH/U9XUzIlUCU5heN9qQAlMl3rmxsKnTYxVWdIjSN461Nf71F6jPhL/Q+VCAMesguOEF0AqyhnH0nw==";
|
||||
hash = "sha512-hmdWGteMDt4HhYq+k9twuftalpTzHtGnVVLphZcpJcw+6vJfersciDMaeLRqbCAeFbzJdgzjYo76bpP6FubySw==";
|
||||
};
|
||||
};
|
||||
|
||||
### Eclipse Scala SDK
|
||||
|
||||
eclipse-scala-sdk =
|
||||
buildEclipseUnversioned.override { jdk = jdk8; gtk = gtk2; } {
|
||||
buildEclipse.override { jdk = jdk8; gtk = gtk2; } {
|
||||
name = "eclipse-scala-sdk-4.7.0";
|
||||
description = "Eclipse IDE for Scala Developers";
|
||||
productVersion = "4.7";
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://downloads.typesafe.com/scalaide-pack/4.7.0-vfinal-oxygen-212-20170929/scala-SDK-4.7.0-vfinal-2.12-linux.gtk.x86_64.tar.gz";
|
||||
@@ -88,7 +85,7 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-1wjKNBl6A2XENRVZNtDelPSMAYtc4wRXdQ4CJX/1YcFUPEzbPsX7plO2uJXmDpZcjw3wkQNxqy4bmZF6YnXy/Q==";
|
||||
hash = "sha512-yH4/K9sBLCUc2EVYwPL0dLql/S3AfaV6fFh7ewAuIb7yHtcsOWMqy/h1hZUlFFg2ykfwDWDDHEK7qfTI0hM7BQ==";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -100,7 +97,7 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-UejE0pzgwBYpmNbdGEegMM5iEOMYP+VvebU17YQeJUzh/qYr0B6sfXwJ+cdTCavKCNGLMMDenJMYk9V/6DSZHw==";
|
||||
hash = "sha512-71mXYVLVnyDjYZbJGBKc0aDPq8sbTxlVZRQq7GlSUDv2fsoNYWYgqYfK7RSED5yoasCfs3HUYr7QowRAKJOnfQ==";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -112,7 +109,7 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-9E0Zwv64qRwVdPouhmIYT6SkbTkd3zLnfkHduHy2VXvmqW7xaOfmplvxpr+V1RDpnfDfw4RouU+WQdhFqBqcWg==";
|
||||
hash = "sha512-55i9YVOa+vKHt72vHIqy9BmKMkg1KaLqMStjTtfaLTH5yP0ei+NTP2XL8IBHOgu0hCEJqYXTq+3I3RQy476etQ==";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -124,7 +121,7 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-V7GmvqQVZnTkkhKmuGyMiZlFlRpFbXM7r6w9yS0FxBOHNHIzkX4pJ6sgn+ww1lvwsdPqBFYtbWUiuKo73eTKzg==";
|
||||
hash = "sha512-zGeynifM0dn1214HEVS7OVtv7xa8asjLzOXh5riJK8c/DWvNrRduHn6o6PGnxYOYVIfC9BzNRAjG1STkWu9j+Q==";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -136,7 +133,7 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha256-8qQWwUiNemJLTAncZwO14fBfr7kTmmXPSeqBLfV8wTw=";
|
||||
hash = "sha256-ml76ix0fHuR0KqYWQuTftEBAgq7iaOIyvr8V6WhuzeU=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -255,12 +255,12 @@ rec {
|
||||
cdt = buildEclipseUpdateSite rec {
|
||||
name = "cdt-${version}";
|
||||
# find current version at https://www.eclipse.org/cdt/downloads.php
|
||||
version = "10.7.0";
|
||||
version = "11.0.0";
|
||||
|
||||
src = fetchzip {
|
||||
stripRoot = false;
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip";
|
||||
hash = "sha256-/lQ3TLFQ1IgwYM540gxAFiEGOfHQIQQMf/pqCZ29ztQ=";
|
||||
hash = "sha256-2rt9crMqNFevIHFIdOGWDq+j0ZJPVt1a9Z7P9HG58Ks=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -471,6 +471,8 @@ buildStdenv.mkDerivation ({
|
||||
separateDebugInfo = enableDebugSymbols;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null;
|
||||
|
||||
# tests were disabled in configureFlags
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cmctl";
|
||||
version = "1.10.1";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cert-manager";
|
||||
repo = "cert-manager";
|
||||
rev = "a96bae172ddb1fcd4b57f1859ab9d1a9e94f7451";
|
||||
sha256 = "0wj2fshkfdrqrjyq3khzpdjiw5x3djjw9x7qq8mdgzyj84cmz11w";
|
||||
rev = "2a0ef53b06e183356d922cd58af2510d8885bef5";
|
||||
sha256 = "0cvsmc06gg8w5j2k1zj4i8qpqlvpjfa6d7wn24v0hs1a1qk8c7a8";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-WPFteR3t9qQiuBcCLqvp8GterqcD2SxJi59Wb7BvDT4=";
|
||||
vendorSha256 = "sha256-aLEQoNt/5ikMw+wExSUITey/68Gk4+dsRbSydsiEiEg=";
|
||||
|
||||
subPackages = [ "cmd/ctl" ];
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
mkDerivation rec {
|
||||
pname = "dsview";
|
||||
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DreamSourceLab";
|
||||
repo = "DSView";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TE2yfzv2h77GLMkmoVGXmzs7J0l/N+n1eYxyrtnrnGU=";
|
||||
sha256 = "sha256-QaCVu/n9PDbAiJgPDVN6SJMILeUO/KRkKcHYAstm86Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
-10
@@ -1,10 +0,0 @@
|
||||
--- jbsrc/jb.c.orig 2014-01-19 20:06:48.525462981 +0100
|
||||
+++ jbsrc/jb.c 2014-01-19 20:07:36.087934897 +0100
|
||||
@@ -425,7 +425,6 @@
|
||||
*/
|
||||
jb_compile_options_add_cflags(object->compile_options, "-std=c99");
|
||||
jb_compile_options_add_cppflags(object->compile_options, "-D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L");
|
||||
- jb_compile_options_add_libs(object->compile_options, "-lbsd-compat");
|
||||
}
|
||||
|
||||
jb_compile_options_add_string_defines(object->compile_options,
|
||||
@@ -22,6 +22,19 @@ let
|
||||
in
|
||||
lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
|
||||
// {
|
||||
qt3d = {
|
||||
inherit version;
|
||||
src = fetchgit {
|
||||
url = "https://invent.kde.org/qt/qt/qt3d.git";
|
||||
rev = "c3c7e6ebc29cce466d954f72f340a257d76b5ec2";
|
||||
sha256 = "sha256-KMWZ4N2OO7TBVpcgvQf/gweZRT62i9XABOnq0x94PY4=";
|
||||
fetchLFS = false;
|
||||
fetchSubmodules = true;
|
||||
deepClone = false;
|
||||
leaveDotGit = false;
|
||||
};
|
||||
};
|
||||
|
||||
# qtwebkit does not have an official release tarball on the qt mirror and is
|
||||
# mostly maintained by the community.
|
||||
qtwebkit = rec {
|
||||
|
||||
@@ -1,21 +1,41 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, redis
|
||||
, redis-server
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "logutils";
|
||||
version = "0.3.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "bc058a25d5c209461f134e1f03cab637d66a7a5ccc12e593db56fbb279899a82";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
redis
|
||||
redis-server
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# https://bitbucket.org/vinay.sajip/logutils/issues/4/035-pytest-test-suite-warnings-and-errors
|
||||
"test_hashandlers"
|
||||
];
|
||||
|
||||
disabledTestPaths = lib.optionals (stdenv.isDarwin) [
|
||||
# Exception: unable to connect to Redis server
|
||||
"tests/test_redis.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Logging utilities";
|
||||
homepage = "https://bitbucket.org/vinay.sajip/logutils/";
|
||||
license = licenses.bsd0;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -36,6 +36,8 @@ buildPythonPackage rec {
|
||||
ninja
|
||||
pyproject-metadata
|
||||
tomli
|
||||
] ++ lib.optionals (pythonOlder "3.10") [
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
# Ugly work-around. Drop ninja dependency.
|
||||
|
||||
@@ -9,12 +9,13 @@
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, python-dotenv
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
, pyupgrade
|
||||
, typing-extensions
|
||||
# dependencies for building documentation.
|
||||
# docs fail to build in Darwin sandbox: https://github.com/samuelcolvin/pydantic/issues/4245
|
||||
, withDocs ? (stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isDarwin)
|
||||
, withDocs ? (stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isDarwin && pythonAtLeast "3.10")
|
||||
, ansi2html
|
||||
, markdown-include
|
||||
, mkdocs
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysmbc";
|
||||
version = "1.0.24";
|
||||
version = "1.0.25.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zq3o1hHmPXKnXSYrNCptyDa2+AqzjqX9WtRD4ve+LO0=";
|
||||
hash = "sha256-IvFxXfglif2cxCU/6rOQtO8Lq/FPZFE82NB7N4mWMiY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keycloak";
|
||||
version = "20.0.1";
|
||||
version = "20.0.3";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
|
||||
sha256 = "sha256-UriiCCVKxdcaKEcDyn8HsS1S4zJAUC2chYu6iiNsJwA=";
|
||||
sha256 = "sha256-dDB3jG3k3ZkAzsG4p3VHpMBM8nxvxQ2sxGeRXWI1Wm0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper jre ];
|
||||
|
||||
@@ -165,6 +165,9 @@ let
|
||||
outputs = [ "out" "doc" ]
|
||||
++ lib.optional (builtins.elem "documentation" features_) "man";
|
||||
|
||||
# FIXME: workaround for Pipewire 0.3.64 deprecated API change, remove when fixed upstream
|
||||
NIX_CFLAGS_COMPILE = [ "-DPW_ENABLE_DEPRECATED" ];
|
||||
|
||||
CXXFLAGS = lib.optionals stdenv.isDarwin [
|
||||
"-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0"
|
||||
];
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"de_DE": {
|
||||
"path": "de_DE",
|
||||
"rev": "1010364",
|
||||
"sha256": "0viir2hyfvf8vbnfz8hzijsbdqqqigd887risvdsy8w8ysd71f8r",
|
||||
"rev": "1036537",
|
||||
"sha256": "001jh83kv86av8yvkdwfcvpwik1yz8qxkyybmqkgx13hpaxhbf80",
|
||||
"version": "6.0"
|
||||
},
|
||||
"fr_FR": {
|
||||
|
||||
@@ -1,9 +1,15 @@
|
||||
{
|
||||
"add-widget-after-content": {
|
||||
"path": "add-widget-after-content/tags/2.4.4",
|
||||
"rev": "2671853",
|
||||
"sha256": "0snrkd783f1qxry01858l3r0ll9381xhsig7wlmrvi1zm5jf2drc",
|
||||
"version": "2.4.4"
|
||||
"path": "add-widget-after-content/tags/2.4.5",
|
||||
"rev": "2844985",
|
||||
"sha256": "17h55fzmssaqv5k2s2a2n5rz49flhzg9gflnps1qpr62apki5156",
|
||||
"version": "2.4.5"
|
||||
},
|
||||
"akismet": {
|
||||
"path": "akismet/tags/5.0.2",
|
||||
"rev": "2827210",
|
||||
"sha256": "0qxpivk7s0q23bf64bwq8k81l593jyc178kqlgnvfkkvgs51kjk7",
|
||||
"version": "5.0.2"
|
||||
},
|
||||
"antispam-bee": {
|
||||
"path": "antispam-bee/tags/2.11.1",
|
||||
@@ -24,10 +30,10 @@
|
||||
"version": "2.0.14"
|
||||
},
|
||||
"co-authors-plus": {
|
||||
"path": "co-authors-plus/tags/3.5.6",
|
||||
"rev": "2819241",
|
||||
"sha256": "02na4smh9mba8bpksmcbj6k8q2k0024ax40p1k7zs8s22s70nkc1",
|
||||
"version": "3.5.6"
|
||||
"path": "co-authors-plus/tags/3.5.7",
|
||||
"rev": "2844205",
|
||||
"sha256": "0d6ji1410fg0mp8926y8c5nmnkp2m76wrbaia7ppb0c9h1pbki65",
|
||||
"version": "3.5.7"
|
||||
},
|
||||
"code-syntax-block": {
|
||||
"path": "code-syntax-block/tags/3.1.1",
|
||||
@@ -48,10 +54,16 @@
|
||||
"version": "1.0.1"
|
||||
},
|
||||
"gutenberg": {
|
||||
"path": "gutenberg/tags/14.9.0",
|
||||
"rev": "2843613",
|
||||
"sha256": "1aa27nmks0b411n13qsgk0xhh82n8cjpqxj6r4v55lfr835rr4av",
|
||||
"version": "14.9.0"
|
||||
"path": "gutenberg/tags/14.9.1",
|
||||
"rev": "2845697",
|
||||
"sha256": "0wkwbka78nj6dqrjrm9qpbzfk848v38myrzvdwk40qz8ab6mhrqb",
|
||||
"version": "14.9.1"
|
||||
},
|
||||
"hello-dolly": {
|
||||
"path": "hello-dolly/tags/1.7.2",
|
||||
"rev": "2807593",
|
||||
"sha256": "0zzbzdkzpgc65djn3694li82zc2q25q3zzv0kqjr7zwqmnrli0jp",
|
||||
"version": "1.7.2"
|
||||
},
|
||||
"hkdev-maintenance-mode": {
|
||||
"path": "hkdev-maintenance-mode/trunk",
|
||||
@@ -60,10 +72,10 @@
|
||||
"version": "2.2.6"
|
||||
},
|
||||
"jetpack": {
|
||||
"path": "jetpack/tags/11.6",
|
||||
"rev": "2829451",
|
||||
"sha256": "0hfsjcfd10mplsh4k78mmag9nh2zl0m42vrgrykdaw58zwjis2fj",
|
||||
"version": "11.6"
|
||||
"path": "jetpack/tags/11.7",
|
||||
"rev": "2846103",
|
||||
"sha256": "0nsq0m3ir3dygivljwg05nl8m2bsb47r8nq9r83jj930a996x5cj",
|
||||
"version": "11.7"
|
||||
},
|
||||
"jetpack-lite": {
|
||||
"path": "jetpack-lite/tags/3.0.3",
|
||||
@@ -72,16 +84,16 @@
|
||||
"version": "3.0.3"
|
||||
},
|
||||
"lightbox-photoswipe": {
|
||||
"path": "lightbox-photoswipe/tags/5.0.18",
|
||||
"rev": "2796750",
|
||||
"sha256": "1c6wnxq70rxqj95w0ygnhkl8kxnvcpy4sxj2nniim0wsilpr3w8g",
|
||||
"version": "5.0.18"
|
||||
"path": "lightbox-photoswipe/tags/5.0.19",
|
||||
"rev": "2845708",
|
||||
"sha256": "00nll7i5h71bq9h3f4fnkf4zg1z8vrmrmzq7a5f71ysymsw104g1",
|
||||
"version": "5.0.19"
|
||||
},
|
||||
"mailpoet": {
|
||||
"path": "mailpoet/tags/4.3.1",
|
||||
"rev": "2843001",
|
||||
"sha256": "0nnmfk1rxhf31makfc0v7mlh30799saxpf8agqdlavrmqpvypvzb",
|
||||
"version": "4.3.1"
|
||||
"path": "mailpoet/tags/4.4.0",
|
||||
"rev": "2846160",
|
||||
"sha256": "0p99634i5k11m06lbh3cx92iacbgv4qc9cix9p8w8349v0wp66a8",
|
||||
"version": "4.4.0"
|
||||
},
|
||||
"merge-minify-refresh": {
|
||||
"path": "merge-minify-refresh/trunk",
|
||||
@@ -108,10 +120,10 @@
|
||||
"version": "0.9.3"
|
||||
},
|
||||
"webp-converter-for-media": {
|
||||
"path": "webp-converter-for-media/tags/5.6.2",
|
||||
"rev": "2843800",
|
||||
"sha256": "0yki15slmvvnc9511gsg7kkvmnic3cb0p7iz2lm90j4pdchz0api",
|
||||
"version": "5.6.2"
|
||||
"path": "webp-converter-for-media/tags/5.6.3",
|
||||
"rev": "2846410",
|
||||
"sha256": "17h4dbd77qfb6djlw87s2cswhpb63d78jj4f629q81hfasm87rdw",
|
||||
"version": "5.6.3"
|
||||
},
|
||||
"webp-express": {
|
||||
"path": "webp-express/tags/0.25.5",
|
||||
@@ -120,10 +132,10 @@
|
||||
"version": "0.25.5"
|
||||
},
|
||||
"wordpress-seo": {
|
||||
"path": "wordpress-seo/tags/19.13",
|
||||
"rev": "2836498",
|
||||
"sha256": "1ajfxw0fhx0lispcmlcm6wlgfml6kq2315gfdnlf41ai8rl3lpkh",
|
||||
"version": "19.13"
|
||||
"path": "wordpress-seo/tags/19.14",
|
||||
"rev": "2845973",
|
||||
"sha256": "03z416vj5xw4pq58g5jr5ai7hkjswi94xjldcah22iy0q6031v2n",
|
||||
"version": "19.14"
|
||||
},
|
||||
"worker": {
|
||||
"path": "worker/tags/4.9.16",
|
||||
@@ -138,16 +150,16 @@
|
||||
"version": "1.0"
|
||||
},
|
||||
"wp-fastest-cache": {
|
||||
"path": "wp-fastest-cache/tags/1.0.9",
|
||||
"rev": "2833576",
|
||||
"sha256": "00jajz49lqgcl83hkiis9qf3h4zh7xzpnwi17hrmnarrqss9z7q2",
|
||||
"version": "1.0.9"
|
||||
"path": "wp-fastest-cache/tags/1.1.0",
|
||||
"rev": "2846969",
|
||||
"sha256": "0vzmsvifzizm3cdp3g3zrr02d6f35mi35dhbmng7xkz5lfvi78i9",
|
||||
"version": "1.1.0"
|
||||
},
|
||||
"wp-gdpr-compliance": {
|
||||
"path": "wp-gdpr-compliance/tags/2.0.20",
|
||||
"rev": "2793947",
|
||||
"sha256": "1vvwmi03hjyqw566m75m8lxbhnl3y4h461531a26xwsbmjgbmf9a",
|
||||
"version": "2.0.20"
|
||||
"path": "wp-gdpr-compliance/tags/2.0.21",
|
||||
"rev": "2845379",
|
||||
"sha256": "1bdwvvrrr1rm64lfdfyzmgbcs2f89mbs3jbzpkcapcl81ad9wjki",
|
||||
"version": "2.0.21"
|
||||
},
|
||||
"wp-mail-smtp": {
|
||||
"path": "wp-mail-smtp/tags/3.7.0",
|
||||
@@ -156,10 +168,10 @@
|
||||
"version": "3.7.0"
|
||||
},
|
||||
"wp-statistics": {
|
||||
"path": "wp-statistics/tags/13.2.11",
|
||||
"rev": "2841966",
|
||||
"sha256": "0bdg63q9wq82rpj7lxiwsvbpxa03r2v1pngs2pxifd4632b7ikni",
|
||||
"version": "13.2.11"
|
||||
"path": "wp-statistics/tags/13.2.15",
|
||||
"rev": "2847850",
|
||||
"sha256": "1x205kffqzqm2156vxb67i12a2k4figzbdhahilnbl1qihskgcsy",
|
||||
"version": "13.2.15"
|
||||
},
|
||||
"wp-user-avatars": {
|
||||
"path": "wp-user-avatars/trunk",
|
||||
@@ -168,9 +180,9 @@
|
||||
"version": "1.4.1"
|
||||
},
|
||||
"wpforms-lite": {
|
||||
"path": "wpforms-lite/tags/1.7.9",
|
||||
"rev": "2844054",
|
||||
"sha256": "1hhcl75cb7njgch0app9kifl9fjznan1m4gqa3yc6kdhicjb5sz6",
|
||||
"version": "1.7.9"
|
||||
"path": "wpforms-lite/tags/1.7.9.1",
|
||||
"rev": "2846820",
|
||||
"sha256": "0a7qzxvzzg5c2m623ghfvza4xpzagzhm28iy93j4557j6b5118fg",
|
||||
"version": "1.7.9.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,10 +1,28 @@
|
||||
{
|
||||
"twentynineteen": {
|
||||
"path": "twentynineteen/2.4",
|
||||
"rev": "178730",
|
||||
"sha256": "1yi6pfndykgd1igd4fd6rqqg5mqa6hnszi3nwv3h1pmjz5yx7vs1",
|
||||
"version": "2.4"
|
||||
},
|
||||
"twentytwenty": {
|
||||
"path": "twentytwenty/2.1",
|
||||
"rev": "178731",
|
||||
"sha256": "1nqd286jkivaqylz9nfsa8naz2xwpyclhk7b8x8wvb4yn4cgrnc5",
|
||||
"version": "2.1"
|
||||
},
|
||||
"twentytwentyone": {
|
||||
"path": "twentytwentyone/1.7",
|
||||
"rev": "178738",
|
||||
"sha256": "090j6xb2hpq4qjis4yismgzip893ihdqs5r58a13nngl17xilmxw",
|
||||
"version": "1.7"
|
||||
},
|
||||
"twentytwentythree": {
|
||||
"path": "twentytwentythree/1.0",
|
||||
"rev": "178734",
|
||||
"sha256": "1avrdg1fnv524xb921rgh2hrj87avbb3hhq1szs1mh9g1gv83i0x",
|
||||
"version": "1.0"
|
||||
},
|
||||
"twentytwentytwo": {
|
||||
"path": "twentytwentytwo/1.3",
|
||||
"rev": "178733",
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
[
|
||||
"add-widget-after-content"
|
||||
, "akismet"
|
||||
, "antispam-bee"
|
||||
, "async-javascript"
|
||||
, "breeze"
|
||||
@@ -8,6 +9,7 @@
|
||||
, "co-authors-plus"
|
||||
, "disable-xml-rpc"
|
||||
, "gutenberg"
|
||||
, "hello-dolly"
|
||||
, "hkdev-maintenance-mode"
|
||||
, "jetpack"
|
||||
, "jetpack-lite"
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
[
|
||||
"twentytwentytwo"
|
||||
"twentynineteen"
|
||||
, "twentytwenty"
|
||||
, "twentytwentytwo"
|
||||
, "twentytwentyone"
|
||||
, "twentytwentythree"
|
||||
]
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ stdenv
|
||||
, fetchpatch
|
||||
, bashInteractive
|
||||
, diffPlugins
|
||||
, glibcLocales
|
||||
@@ -51,6 +52,11 @@ python3Packages.buildPythonApplication rec {
|
||||
patches = [
|
||||
# Bash completion fix for Nix
|
||||
./patches/bash-completion-always-print.patch
|
||||
(fetchpatch {
|
||||
# Fix unidecode>=1.3.5 compat
|
||||
url = "https://github.com/beetbox/beets/commit/5ae1e0f3c8d3a450cb39f7933aa49bb78c2bc0d9.patch";
|
||||
hash = "sha256-gqkrE+U1j3tt1qPRJufTGS/GftaSw/gweXunO/mCVG8=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "minio-client";
|
||||
version = "2022-12-13T00-23-28Z";
|
||||
version = "2023-01-11T03-14-16Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "mc";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-wRkpc1S9booT9jVrDdmuj1eQInXafax2ZGvHgcuoiTA=";
|
||||
sha256 = "sha256-wxI4m4RAvi2YCx+RWO9HQyn927O3PUJ/A9i/5IOtbZ8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-D3d+aSEe1d1Tw0//L8MGuZHt5GjURTn3Vni9l4BafEI=";
|
||||
vendorHash = "sha256-Exhw9H+qayQnpT4qCaeOsmbTCmCy80UKk8ZxDuOOHcA=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ldapmonitor";
|
||||
version = "1.3";
|
||||
version = "1.4";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "p0dalirius";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-lwTXvrnOVodCUQtR8FmCXiPuZ1Wx1ySfDKghpLXNuI4=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-BmTj/6dOUYfia6wO4nvkEW01MIC9TuBk4kYAsVHMsWY=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/python";
|
||||
@@ -34,6 +34,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
meta = with lib; {
|
||||
description = "Tool to monitor creation, deletion and changes to LDAP objects";
|
||||
homepage = "https://github.com/p0dalirius/LDAPmonitor";
|
||||
changelog = "https://github.com/p0dalirius/LDAPmonitor/releases/tag/${version}";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@@ -5509,7 +5509,9 @@ self: super: with self; {
|
||||
|
||||
loguru = callPackage ../development/python-modules/loguru { };
|
||||
|
||||
logutils = callPackage ../development/python-modules/logutils { };
|
||||
logutils = callPackage ../development/python-modules/logutils {
|
||||
redis-server = pkgs.redis;
|
||||
};
|
||||
|
||||
logzero = callPackage ../development/python-modules/logzero { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user