nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-22.11 into staging-next-22.11

Browse Source
This commit is contained in:
github-actions[bot]
2023-01-16 00:13:52 +00:00
committed by GitHub
parent d9a7f62640 f6198c78f7
commit ba46d12863
34 changed files with 257 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/tests/kernel-generic.nix
View File

@@ -31,6 +31,7 @@ let
linux_5_10_hardened
linux_5_15_hardened
linux_6_0_hardened
linux_6_1_hardened
linux_testing;
};

20
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@@ -1,21 +1,21 @@
{
"stable": {
"version": "108.0.5359.124",
"sha256": "0x9ac6m4xdccjdrk2bmq4y7bhfpgf2dv0q7lsbbsa50vlv1gm3fl",
"sha256bin64": "00c11svz9dzkg57484jg7c558l0jz8jbgi5zyjs1w7xp24vpnnpg",
"version": "109.0.5414.74",
"sha256": "0pcfaj3n3rjk4va9g0ajlsv1719kdhqcnjdd4piinqxb4qy27vgd",
"sha256bin64": "1qfp9li90p2d6asy60v12h7r4025l01yf3dzcdyihvr0la3bhdrx",
"deps": {
"gn": {
"version": "2022-10-05",
"version": "2022-11-10",
"url": "https://gn.googlesource.com/gn",
"rev": "b9c6c19be95a3863e02f00f1fe403b2502e345b6",
"sha256": "1rhadb6qk867jafr85x2m3asis3jv7x06blhmad2d296p26d5w6x"
"rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41",
"sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b"
}
},
"chromedriver": {
"version": "108.0.5359.71",
"sha256_linux": "0lxmzmjpy4j5k3hx7wxdbbk87fr883a6323r9fj5nmylb230i3p4",
"sha256_darwin": "14kl58qlxkfq7hipg717nwawzcx7qzg77v322ikgrvqi03f0saci",
"sha256_darwin_aarch64": "08rbp1dqv1xvy1w9jsip3140frbifzblgrn6i9xr612hxysxhap6"
"version": "109.0.5414.25",
"sha256_linux": "1gybh9nyc2j96ics1898qkrn1aajb2gpjb8l6b2p0hs24iqhjilg",
"sha256_darwin": "1w3sz9sxjkir2wwkzjx870qq04xzf9z7b59m953w33mkfm6zvz71",
"sha256_darwin_aarch64": "1qfg22glac44y5pdzscm2yr6wjnhm7p7pkiadblky27fp13dpyv0"
}
},
"beta": {

4
pkgs/applications/networking/instant-messengers/discord/default.nix
View File

@@ -1,7 +1,7 @@
{ branch ? "stable", callPackage, fetchurl, lib, stdenv }:
let
versions = if stdenv.isLinux then {
stable = "0.0.22";
stable = "0.0.24";
ptb = "0.0.38";
canary = "0.0.145";
} else {
@@ -14,7 +14,7 @@ let
x86_64-linux = {
stable = fetchurl {
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
sha256 = "sha256-F1xzdx4Em6Ref7HTe9EH7whx49iFc0DFpaQKdFquq6c=";
sha256 = "sha256-SG+34ft0mTqtg9rFiI60N6JIONyqF8c8SlnRcn5a4Xc=";
};
ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";

2
pkgs/applications/science/astronomy/stellarium/default.nix
View File

@@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
homepage = "https://stellarium.org/";
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ ma27 ];
maintainers = with maintainers; [ ];
};
}

2
pkgs/applications/window-managers/i3/status-rust.nix
View File

@@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec {
description = "Very resource-friendly and feature-rich replacement for i3status";
homepage = "https://github.com/greshake/i3status-rust";
license = licenses.gpl3Only;
maintainers = with maintainers; [ backuitist globin ma27 ];
maintainers = with maintainers; [ backuitist globin ];
platforms = platforms.linux;
};
}

2
pkgs/applications/window-managers/sway/lock-effects.nix
View File

@@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
inherit (src.meta) homepage;
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ gnxlxnxx ma27 ];
maintainers = with maintainers; [ gnxlxnxx ];
};
}

17
pkgs/development/libraries/libsolv/default.nix
View File

@@ -1,6 +1,9 @@
{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config
, zlib, xz, bzip2, zchunk, zstd
, expat, rpm, db }:
, expat
, withRpm ? !stdenv.isDarwin, rpm
, db
}:
stdenv.mkDerivation rec {
version = "0.7.22";
@@ -15,19 +18,21 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DENABLE_COMPLEX_DEPS=true"
"-DENABLE_RPMMD=true"
"-DENABLE_RPMDB=true"
"-DENABLE_PUBKEY=true"
"-DENABLE_RPMDB_BYRPMHEADER=true"
"-DENABLE_LZMA_COMPRESSION=true"
"-DENABLE_BZIP2_COMPRESSION=true"
"-DENABLE_ZSTD_COMPRESSION=true"
"-DENABLE_ZCHUNK_COMPRESSION=true"
"-DWITH_SYSTEM_ZCHUNK=true"
] ++ lib.optionals withRpm [
"-DENABLE_PUBKEY=true"
"-DENABLE_RPMDB=true"
"-DENABLE_RPMDB_BYRPMHEADER=true"
"-DENABLE_RPMMD=true"
];
nativeBuildInputs = [ cmake ninja pkg-config ];
buildInputs = [ zlib xz bzip2 zchunk zstd expat rpm db ];
buildInputs = [ zlib xz bzip2 zchunk zstd expat db ]
++ lib.optional withRpm rpm;
meta = with lib; {
description = "A free package dependency solver";

2
pkgs/development/python-modules/numcodecs/default.nix
View File

@@ -9,7 +9,6 @@
, msgpack
, pytestCheckHook
, python
, gcc8
}:
buildPythonPackage rec {
@@ -25,7 +24,6 @@ buildPythonPackage rec {
nativeBuildInputs = [
setuptools-scm
cython
gcc8
];
propagatedBuildInputs = [

28
pkgs/development/python-modules/opencensus-context/default.nix Normal file
View File

@@ -0,0 +1,28 @@
{ buildPythonPackage
, fetchPypi
, lib
, unittestCheckHook
}:
buildPythonPackage rec {
pname = "opencensus-context";
version = "0.1.3";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-oDEIw8ENjIC7Xd9cih8DMWH6YZcqmRf5ubOhhRfwCIw=";
};
pythonNamespaces = [
"opencensus.common"
];
doCheck = false; # No tests in archive
meta = with lib; {
description = "OpenCensus Runtime Context";
homepage = "https://github.com/census-instrumentation/opencensus-python/tree/master/context/opencensus-context";
license = licenses.asl20;
maintainers = with maintainers; [ billhuang ];
};
}

34
pkgs/development/python-modules/opencensus/default.nix
View File

@@ -1,24 +1,11 @@
{ buildPythonPackage
, fetchPypi
, lib
, python
, unittestCheckHook
, google-api-core
, opencensus-context
}:
let
opencensus-context = buildPythonPackage rec {
pname = "opencensus-context";
version = "0.1.3";
checkInputs = [ unittestCheckHook ];
src = fetchPypi {
inherit pname version;
sha256 = "sha256-oDEIw8ENjIC7Xd9cih8DMWH6YZcqmRf5ubOhhRfwCIw=";
};
};
in
buildPythonPackage rec {
pname = "opencensus";
version = "0.11.0";
@@ -28,23 +15,20 @@ buildPythonPackage rec {
sha256 = "sha256-AmIWq6uJ2U2FBJLz3GWVAFXsT4QRX6bHvq/7pEo0bkI=";
};
buildInputs = [
# opencensus-context is embedded in opencensus
propagatedBuildInputs = [
google-api-core
opencensus-context
];
propagatedBuildInputs = [
google-api-core
pythonNamespaces = [
"opencensus.common"
];
postInstall = ''
ln -sf ${opencensus-context}/${python.sitePackages}/opencensus/common/runtime_context \
$out/${python.sitePackages}/opencensus/common/
'';
doCheck = false; # No tests in sdist
checkInputs = [ unittestCheckHook ];
pythonImportsCheck = [ "opencensus" ];
pythonImportsCheck = [
"opencensus.common"
];
meta = with lib; {
description = "A stats collection and distributed tracing framework";

39
pkgs/development/python-modules/python-decouple/default.nix Normal file
View File

@@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, mock
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "python-decouple";
version = "3.6";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "HBNetwork";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Ll0MZb4FaNFF/jvCfj4TkuoAi4m448KaOU3ykvKPbSo=";
};
checkInputs = [
mock
pytestCheckHook
];
pythonImportsCheck = [
"decouple"
];
meta = with lib; {
description = "Module to handle code and condifuration";
homepage = "https://github.com/HBNetwork/python-decouple";
changelog = "https://github.com/HBNetwork/python-decouple/blob/v${version}/CHANGELOG.md";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

7
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
View File

@@ -1,7 +1,7 @@
{ lib, buildGoModule, fetchFromGitLab, fetchurl, bash }:
let
version = "15.5.1";
version = "15.7.2";
in
buildGoModule rec {
inherit version;
@@ -17,13 +17,13 @@ buildGoModule rec {
# For patchShebangs
buildInputs = [ bash ];
vendorSha256 = "sha256-IcsYH1V3b5IUY2JqOADJrc4lkng1GS7lndfHObRQbxU=";
vendorSha256 = "sha256-lZAESAJ7ZRjHW6MD/xm3rOczK0h8EfmRAAVxRbVLu/k=";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
sha256 = "sha256-ZvQaA4DSuEIdHEoRKJg5tOnBQgf26paTAiWy6RLRG3o=";
sha256 = "sha256-NiBQQ36F8aYi1Uk3P0UgBy4Pai6Coz3oQDvWWOGGQNw=";
};
patches = [
@@ -46,6 +46,7 @@ buildGoModule rec {
rm executors/docker/terminal_test.go
rm executors/docker/docker_test.go
rm helpers/docker/auth/auth_test.go
rm executors/docker/services_test.go
'';
postInstall = ''

18
pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch
View File

@@ -1,25 +1,23 @@
diff --git a/shells/bash_test.go b/shells/bash_test.go
index b8a48f85e..0e3173fc3 100644
index 9ed9e65ff..02b6e6d5f 100644
--- a/shells/bash_test.go
+++ b/shells/bash_test.go
@@ -4,12 +4,9 @@
package shells
@@ -4,11 +4,9 @@ package shells
import (
"path"
- "runtime"
"testing"
"github.com/stretchr/testify/assert"
- "github.com/stretchr/testify/require"
- "gitlab.com/gitlab-org/gitlab-runner/common"
"gitlab.com/gitlab-org/gitlab-runner/common"
)
func TestBash_CommandShellEscapesLegacy(t *testing.T) {
@@ -84,62 +81,3 @@ func TestBash_CheckForErrors(t *testing.T) {
})
@@ -90,65 +88,6 @@ func TestBash_CheckForErrors(t *testing.T) {
}
}
-
-func TestBash_GetConfiguration(t *testing.T) {
- tests := map[string]struct {
- info common.ShellScriptInfo
@@ -78,3 +76,7 @@ index b8a48f85e..0e3173fc3 100644
- })
- }
-}
-
func Test_BashWriter_isTmpFile(t *testing.T) {
tmpDir := "/foo/bar"
bw := BashWriter{TemporaryPath: tmpDir}

2
pkgs/development/tools/misc/jiq/default.nix
View File

@@ -26,6 +26,6 @@ buildGoModule rec {
homepage = "https://github.com/fiatjaf/jiq";
license = licenses.mit;
description = "jid on jq - interactive JSON query tool using jq expressions";
maintainers = with maintainers; [ ma27 ];
maintainers = with maintainers; [ ];
};
}

2
pkgs/development/tools/rnix-lsp/default.nix
View File

@@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "A work-in-progress language server for Nix, with syntax checking and basic completion";
license = licenses.mit;
maintainers = with maintainers; [ ma27 ];
maintainers = with maintainers; [ ];
};
}

40
pkgs/os-specific/linux/kernel/hardened/patches.json
View File

@@ -22,22 +22,22 @@
"5.10": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.161-hardened1.patch",
"sha256": "0lkgixy3qn2lf2snp7zsxyp6fad0b6yvvg2hk6l1jp9z8293gsap",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.161-hardened1/linux-hardened-5.10.161-hardened1.patch"
"name": "linux-hardened-5.10.163-hardened1.patch",
"sha256": "1mjbngc14grffjakjvx67dwsjff381gsg6k1pjrsmanr9xql4zcz",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.163-hardened1/linux-hardened-5.10.163-hardened1.patch"
},
"sha256": "0ya04njrxr4d37zkxvivmn5f0bdvcb504pyp9ahwz8nqpk8gdaks",
"version": "5.10.161"
"sha256": "084vq2fpkqpzwxhygn7l07wrx0m8cprz9q1l0ihc1aw8sgi2dqln",
"version": "5.10.163"
},
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.86-hardened1.patch",
"sha256": "04yp2qqn9axvkaqgihb1vxnkwnjs5s2q9106y5x4r1q4bf42nz2v",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.86-hardened1/linux-hardened-5.15.86-hardened1.patch"
"name": "linux-hardened-5.15.88-hardened1.patch",
"sha256": "1ahn0ysvnn8bw2ynd4xfzy8pzlnlidv7lwpyd8w5vxnkfzzgpwkz",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.88-hardened1/linux-hardened-5.15.88-hardened1.patch"
},
"sha256": "1vpjnmwqsx6akph2nvbsv2jl7pp8b7xns3vmwbljsl23lkpxkz40",
"version": "5.15.86"
"sha256": "10d1h5d962r9c0xmcw1rylibjz4n2g552axdz5zgjfkav7ykjxa1",
"version": "5.15.88"
},
"5.4": {
"patch": {
@@ -52,11 +52,21 @@
"6.0": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.0.16-hardened1.patch",
"sha256": "19rakmfdkkbvvzphsksccgad3wc2khlcynzdqx10d7spldj8nkp1",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.16-hardened1/linux-hardened-6.0.16-hardened1.patch"
"name": "linux-hardened-6.0.19-hardened1.patch",
"sha256": "11yn5mrvs170685pwa9k7asxlv64vgfqfg2b6m5yn2a11pr1rxg5",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.19-hardened1/linux-hardened-6.0.19-hardened1.patch"
},
"sha256": "1r2wf3hf7yxl7lxma7plyi8pk3dmlsrpm763rf0g1h8ilsy72844",
"version": "6.0.16"
"sha256": "01q2sciv3l9brnsfcv9knx1ps3hq9rk1a08iqk3vscg3waq7xqxb",
"version": "6.0.19"
},
"6.1": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.1.6-hardened1.patch",
"sha256": "1qj7fwz3mhw1qj5q6aqalrq0nsbfqs33jqg51w9pa1zv4z35n79m",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.6-hardened1/linux-hardened-6.1.6-hardened1.patch"
},
"sha256": "1qsygnsn67j843ywpswy5724zin5sszb5mz8b8h3lw553mb8wk9y",
"version": "6.1.6"
}
}

4
pkgs/os-specific/linux/kernel/linux-5.10.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.162";
version = "5.10.163";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "05yjgp1la5flwqji9b6j7nbdgg5fwzv2ph536v4f9pzza3y01i1f";
sha256 = "084vq2fpkqpzwxhygn7l07wrx0m8cprz9q1l0ihc1aw8sgi2dqln";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.15.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.15.86";
version = "5.15.88";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1vpjnmwqsx6akph2nvbsv2jl7pp8b7xns3vmwbljsl23lkpxkz40";
sha256 = "10d1h5d962r9c0xmcw1rylibjz4n2g552axdz5zgjfkav7ykjxa1";
};
} // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-6.0.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.0.17";
version = "6.0.19";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "020xrv9449gd0jnfgi0sb69bgs2p9sd49dghmd3bnnal584r5vm7";
sha256 = "01q2sciv3l9brnsfcv9knx1ps3hq9rk1a08iqk3vscg3waq7xqxb";
};
} // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-6.1.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.1.3";
version = "6.1.6";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "05q3b32kinvbgbibb8s3x8ax3gzlgznlcwvwb4y46gjilzkrmj3d";
sha256 = "1qsygnsn67j843ywpswy5724zin5sszb5mz8b8h3lw553mb8wk9y";
};
} // (args.argsOverride or { }))

4
pkgs/servers/atlassian/jira.nix
View File

@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "atlassian-jira";
version = "9.2.0";
version = "9.4.0";
src = fetchurl {
url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
sha256 = "sha256-+QlZ5/3LZnW7lPvm0it7/pC7kVySbHgf1AQTyPJ+L+U=";
sha256 = "sha256-PParjwX7/7kMd8nMn50Shpur8+f0TTEgeSn85B3BrsI=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/servers/web-apps/wiki-js/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wiki-js";
version = "2.5.294";
version = "2.5.295";
src = fetchurl {
url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz";
sha256 = "sha256-HHqXDmmTcWYRXF0GQf9QKEagYxyc1uvB7MPgLR3zALk=";
sha256 = "sha256-itiW9/QtNpc8cFS5skwlc3JSWoVqbBbIcSlEd+GRkH0=";
};
sourceRoot = ".";

4
pkgs/servers/web-apps/wordpress/generic.nix
View File

@@ -10,8 +10,12 @@ stdenv.mkDerivation rec {
};
installPhase = ''
runHook preInstall
mkdir -p $out/share/wordpress
cp -r . $out/share/wordpress
runHook postInstall
'';
passthru.tests = {

4
pkgs/servers/web-apps/wordpress/packages/languages.json
View File

@@ -1,8 +1,8 @@
{
"de_DE": {
"path": "de_DE",
"rev": "1010364",
"sha256": "0viir2hyfvf8vbnfz8hzijsbdqqqigd887risvdsy8w8ysd71f8r",
"rev": "1036537",
"sha256": "001jh83kv86av8yvkdwfcvpwik1yz8qxkyybmqkgx13hpaxhbf80",
"version": "6.0"
},
"fr_FR": {

108
pkgs/servers/web-apps/wordpress/packages/plugins.json
View File

@@ -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"
}
}

18
pkgs/servers/web-apps/wordpress/packages/themes.json
View File

@@ -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",

2
pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json
View File

@@ -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"

5
pkgs/servers/web-apps/wordpress/packages/wordpress-themes.json
View File

@@ -1,4 +1,7 @@
[
"twentytwentytwo"
"twentynineteen"
, "twentytwenty"
, "twentytwentytwo"
, "twentytwentyone"
, "twentytwentythree"
]

2
pkgs/tools/misc/gotify-cli/default.nix
View File

@@ -25,7 +25,7 @@ buildGoModule rec {
license = licenses.mit;
homepage = "https://github.com/gotify/cli";
description = "A command line interface for pushing messages to gotify/server";
maintainers = with maintainers; [ ma27 ];
maintainers = with maintainers; [ ];
mainProgram = "gotify";
};
}

2
pkgs/tools/networking/dogdns/default.nix
View File

@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec {
description = "Command-line DNS client";
homepage = "https://dns.lookup.dog";
license = licenses.eupl12;
maintainers = with maintainers; [ bbigras ma27 ];
maintainers = with maintainers; [ bbigras ];
mainProgram = "dog";
};
}

2
pkgs/tools/wayland/clipman/default.nix
View File

@@ -31,7 +31,7 @@ buildGoModule rec {
homepage = "https://github.com/yory8/clipman";
description = "A simple clipboard manager for Wayland";
license = licenses.gpl3Only;
maintainers = with maintainers; [ ma27 ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}

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

@@ -25286,6 +25286,8 @@ with pkgs;
linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened;
linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened;
linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened;
linuxPackages_6_1_hardened = linuxKernel.packages.linux_6_1_hardened;
linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened;
# Hardkernel (Odroid) kernels.
linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest;

2
pkgs/top-level/linux-kernels.nix
View File

@@ -241,6 +241,7 @@ in {
linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream";
linux_6_0_hardened = hardenedKernelFor kernels.linux_6_0 { };
linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { };
}));
/* Linux kernel modules are inherently tied to a specific kernel. So
@@ -567,6 +568,7 @@ in {
linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream";
linux_6_0_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_0 { });
linux_6_1_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_1 { });
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);

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

@@ -6457,6 +6457,8 @@ self: super: with self; {
opencensus = callPackage ../development/python-modules/opencensus { };
opencensus-context = callPackage ../development/python-modules/opencensus-context { };
opencv3 = toPythonModule (pkgs.opencv3.override {
enablePython = true;
pythonPackages = self;
@@ -8997,6 +8999,8 @@ self: super: with self; {
python-dbusmock = callPackage ../development/python-modules/python-dbusmock { };
python-decouple = callPackage ../development/python-modules/python-decouple { };
pythondialog = callPackage ../development/python-modules/pythondialog { };
python-didl-lite = callPackage ../development/python-modules/python-didl-lite { };