From aaa1ee0fc75db9679162be9848c643be553c803a Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Tue, 23 Aug 2022 06:08:58 +0200 Subject: [PATCH 001/108] belle-sip: linphone-4.4.1 -> 5.1.55 Bump the version to 5.1.55 and also use its actual version as version number for the package instead of the version number of linphone. Signed-off-by: Felix Singer --- pkgs/development/libraries/belle-sip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 22817feaded..13ba11de1c6 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -11,15 +11,15 @@ stdenv.mkDerivation rec { pname = "belle-sip"; - version = "linphone-4.4.1"; + version = "5.1.55"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; owner = "public"; group = "BC"; repo = pname; - rev = "44d5977570280763ee1fecdb920736715bad58a3"; - sha256 = "sha256-w++v3YlDZfpCHAbUQA/RftjRNGkz9J/zYoxZqRgtvnA="; + rev = version; + sha256 = "sha256-wMf570/RP2Q4yluedECs+AKoH92PQQ8yVY+eBGGSAP4="; }; nativeBuildInputs = [ cmake ]; From 717ce7ac2c7d637e3b242a50995a9a411b81ea4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Sep 2022 03:48:13 +0000 Subject: [PATCH 002/108] gam: 6.22 -> 6.25 --- pkgs/tools/admin/gam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/gam/default.nix b/pkgs/tools/admin/gam/default.nix index 191785dd030..1b90de1d467 100644 --- a/pkgs/tools/admin/gam/default.nix +++ b/pkgs/tools/admin/gam/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "gam"; - version = "6.22"; + version = "6.25"; format = "other"; src = fetchFromGitHub { owner = "GAM-team"; repo = "gam"; - rev = "v${version}"; - sha256 = "sha256-G/S1Rrm+suiy1CTTFLcBGt/QhARL7puHgR65nCxodH0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-/VmBFMjCkd1xhudlcjYGGv+6tgEsyY/xqQoGdupJvOg="; }; sourceRoot = "source/src"; From 76da07ebfb0cdcb295c58bdfd3066a2fe41f6525 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Sep 2022 04:44:53 +0000 Subject: [PATCH 003/108] bada-bib: 0.7.2 -> 0.8.0 --- pkgs/applications/science/misc/bada-bib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/applications/science/misc/bada-bib/default.nix index 2304e9f77f4..43d1923de6f 100644 --- a/pkgs/applications/science/misc/bada-bib/default.nix +++ b/pkgs/applications/science/misc/bada-bib/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { pname = "bada-bib"; - version = "0.7.2"; + version = "0.8.0"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { owner = "RogerCrocker"; repo = "BadaBib"; rev = "refs/tags/v${version}"; - sha256 = "sha256-+b4Ko2srWZUs8zsH9jU+aiKQYZti3z2Bil8PogfpPlc="; + sha256 = "sha256-mdAoJh3qOwtPX8cMCYw7MDDNy10GdhynnS8gtszJROI="; }; nativeBuildInputs = [ From 7b41fe494fc7586b92bdf5b2b77d87589d934b81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Sep 2022 05:23:54 +0000 Subject: [PATCH 004/108] catcli: 0.8.2 -> 0.8.7 --- pkgs/tools/filesystems/catcli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix index 663aecfcbb1..eedbdcc2228 100644 --- a/pkgs/tools/filesystems/catcli/default.nix +++ b/pkgs/tools/filesystems/catcli/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "catcli"; - version = "0.8.2"; + version = "0.8.7"; src = fetchFromGitHub { owner = "deadc0de6"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-IHHlxF/7U7C+wO6YicesZPFV6BSBmdkPWaZn7awplNk="; + sha256 = "sha256-hVunxgc/aUapQYe6k3hKdkC+2Jw0x1HjI/kl/fJdWUo="; }; propagatedBuildInputs = [ docopt anytree ]; From 1dbabf2811847dfbc01e4f13c183f65a33ade89b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 08:42:48 +0000 Subject: [PATCH 005/108] drumgizmo: 0.9.19 -> 0.9.20 --- pkgs/applications/audio/drumgizmo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index 71841a616a3..d6f468dbc56 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "0.9.19"; + version = "0.9.20"; pname = "drumgizmo"; src = fetchurl { url = "https://www.drumgizmo.org/releases/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "18x28vhif0c97xz02k22xwqxxig6fi6j0356mlz2vf7vb25z69kl"; + sha256 = "sha256-AF8gQLiB29j963uI84TyNHIC0qwEWOCqmZIUWGq8V2o="; }; configureFlags = [ "--enable-lv2" ]; From 2208ff5992e08f3e08693238d8310bdeae52b6ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 09:04:02 +0000 Subject: [PATCH 006/108] embree: 3.13.4 -> 3.13.5 --- pkgs/development/libraries/embree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index fb8db3a218e..e4509d058da 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "embree"; - version = "3.13.4"; + version = "3.13.5"; src = fetchFromGitHub { owner = "embree"; repo = "embree"; rev = "v${version}"; - sha256 = "sha256-WmblxU1kHiC8+hYAfUDcbJ1/e80f1LcKX8qCwgaBwGc="; + sha256 = "sha256-tfM4SGOFVBG0pQK9B/iN2xDaW3yjefnTtsoUad75m80="; }; postPatch = '' From 881895aae2ac656da0fb5f45c97a8644f727e47b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Oct 2022 17:42:45 +0000 Subject: [PATCH 007/108] logisim-evolution: 3.7.2 -> 3.8.0 --- pkgs/applications/science/logic/logisim-evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/logisim-evolution/default.nix b/pkgs/applications/science/logic/logisim-evolution/default.nix index 9650d97814b..affbfc170b9 100644 --- a/pkgs/applications/science/logic/logisim-evolution/default.nix +++ b/pkgs/applications/science/logic/logisim-evolution/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logisim-evolution"; - version = "3.7.2"; + version = "3.8.0"; src = fetchurl { url = "https://github.com/logisim-evolution/logisim-evolution/releases/download/v${version}/logisim-evolution-${version}-all.jar"; - sha256 = "sha256-RI+ioOHj13UAGuPzseAAy3oQBQYkja/ucjj4QMeRZhw="; + sha256 = "sha256-TFm+fa3CMp0OMhnKBc6cLIWGQbIG/OpOOCG7ea7wbCw="; }; dontUnpack = true; From 5239a347440cfdb666c29b051d11c7f1a35344d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 09:10:58 +0000 Subject: [PATCH 008/108] envconsul: 0.13.0 -> 0.13.1 --- pkgs/tools/system/envconsul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/envconsul/default.nix b/pkgs/tools/system/envconsul/default.nix index daa92dc7726..5d17f07854d 100644 --- a/pkgs/tools/system/envconsul/default.nix +++ b/pkgs/tools/system/envconsul/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "envconsul"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "envconsul"; rev = "v${version}"; - sha256 = "sha256-Zt4jCqHfDTxSrAIASQgUqtYgcHU9xUs025YOxGXhTAg="; + sha256 = "sha256-9X0mSEMaLGdchf9g5EyRUsn7z6cvbG4QBPoaris7RwQ="; }; - vendorSha256 = "sha256-qxt2LNPDxdiszkjSjgzP7PG26BsZYq1itiyQfy9uaVI="; + vendorSha256 = "sha256-Vunq3lsM1aSXNIr3ZMqE03f0jEI5BpWwMYhZ41tiB9M="; ldflags = [ "-s" From 2d296495e7a8d042a173cab98fcba598f49404ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 11:25:48 +0000 Subject: [PATCH 009/108] libofx: 0.10.7 -> 0.10.9 --- pkgs/development/libraries/libofx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index dd14504bf8b..4d3de82d1b0 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libofx"; - version = "0.10.7"; + version = "0.10.9"; src = fetchFromGitHub { owner = "LibOFX"; repo = pname; rev = version; - sha256 = "sha256-zbSVmduEH7iO/8N6hEpQQMUYDVG6CaNycGOl5bd6fsw="; + sha256 = "sha256-KOQrEAt1jHrOpPQ7QbGUADe0i7sQXNH2fblPRzT0EIg="; }; preConfigure = "./autogen.sh"; From 80d45bffa6b3bafe44dfbba469ba7fbf5f550746 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Oct 2022 19:53:31 +0000 Subject: [PATCH 010/108] leatherman: 1.12.8 -> 1.12.9 --- pkgs/development/libraries/leatherman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index fe5c23b3610..4b84584d53e 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.8"; + version = "1.12.9"; src = fetchFromGitHub { - sha256 = "sha256-5xcwktlwgP9Ltild4BliaGJBqlheDLSTKQLZjzK+nGk="; + sha256 = "sha256-TuiOAinJsQWJVJiaS8kWk4Pl+hn521f4ooJ2p+eR6mk="; rev = version; repo = "leatherman"; owner = "puppetlabs"; From 92bc5dbbae7089db294898dedc7c2b876adeb497 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Oct 2022 00:09:59 +0000 Subject: [PATCH 011/108] picard-tools: 2.27.4 -> 2.27.5 --- pkgs/applications/science/biology/picard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 4696b63d7a1..f6f2f3c43bb 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.27.4"; + version = "2.27.5"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-H52iduXuZXkH7i+1qGq05DTPgLGZD2ke6US5nTzmvDg="; + sha256 = "sha256-Exyj4GJqPvEug5l5XnpJ+Cm7ToXXG0ib9PIx0hpsMZk="; }; nativeBuildInputs = [ makeWrapper ]; From 12cab28e364b27e3a6194b9fb25446ab0eca5f54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Oct 2022 05:15:01 +0000 Subject: [PATCH 012/108] agi: 3.0.1 -> 3.2.1 --- pkgs/tools/graphics/agi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index b9402e23067..13e8705f768 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenvNoCC.mkDerivation rec { pname = "agi"; - version = "3.0.1"; + version = "3.2.1"; src = fetchzip { url = "https://github.com/google/agi/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-793lOJL1/wqETkWfiksnLY3Lmxx500fw4PIzT9ZQqQs="; + sha256 = "sha256-wguQERJ5Zvcodk7QMtloCwI4qYmatmHCFhgArbS07EA="; }; nativeBuildInputs = [ From 00cb2a10cc5cd07e4cd3a26d0741d66d7401d94f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Oct 2022 03:31:49 +0000 Subject: [PATCH 013/108] gama: 2.22 -> 2.23 --- pkgs/applications/science/geometry/gama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/geometry/gama/default.nix b/pkgs/applications/science/geometry/gama/default.nix index 9ca7cc10c77..cdaeaf4fcc2 100644 --- a/pkgs/applications/science/geometry/gama/default.nix +++ b/pkgs/applications/science/geometry/gama/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lib, expat, octave, libxml2, texinfo, zip }: stdenv.mkDerivation rec { pname = "gama"; - version = "2.22"; + version = "2.23"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-jOyoWPcZvHWuddLasjIjHSn8MOV3viIgmBrsuzY7P6U="; + sha256 = "sha256-OKVAgmHdhQoS3kCwclE9ljON3H2NVCCvpR2hgwfqnA0="; }; buildInputs = [ expat ]; From d5f0439c6e93f89ff7e6987c64593538ccc00080 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 00:05:47 +0000 Subject: [PATCH 014/108] semver-tool: 3.3.0 -> 3.4.0 --- pkgs/development/tools/misc/semver-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/semver-tool/default.nix b/pkgs/development/tools/misc/semver-tool/default.nix index 434fba18c59..a26c9917166 100644 --- a/pkgs/development/tools/misc/semver-tool/default.nix +++ b/pkgs/development/tools/misc/semver-tool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "semver-tool"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "fsaintjacques"; repo = pname; rev = version; - sha256 = "sha256-LqZTHFiis4BYL1bnJoeuW56wf8+o38Ygs++CV9CKNhM="; + sha256 = "sha256-BnHuiCxE0VjzMWFTEMunQ9mkebQKIKbbMxZVfBUO57Y="; }; dontBuild = true; # otherwise we try to 'make' which fails. From 60f30ce2149b812d0ae5a33f87fc1ffdefddf44f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Oct 2022 08:35:02 +0000 Subject: [PATCH 015/108] kubevirt: 0.57.1 -> 0.58.0 --- pkgs/tools/virtualization/kubevirt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/kubevirt/default.nix b/pkgs/tools/virtualization/kubevirt/default.nix index ebca6151336..47c75e930dc 100644 --- a/pkgs/tools/virtualization/kubevirt/default.nix +++ b/pkgs/tools/virtualization/kubevirt/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubevirt"; - version = "0.57.1"; + version = "0.58.0"; src = fetchFromGitHub { owner = "kubevirt"; repo = "kubevirt"; rev = "v${version}"; - sha256 = "sha256-b832NNAoLYiHfvAm2eWGa8Odlppj8hLKl7jQA09s+4k="; + sha256 = "sha256-SZ7NN93/lnN2DsNrxKEziiJsLDkFkaCbWMTcUWYiO+w="; }; vendorSha256 = null; From a7b8172046add8cd82c7624b8bfbe4fafe741801 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Oct 2022 21:40:58 +0000 Subject: [PATCH 016/108] surface-control: 0.4.3-1 -> 0.4.3-2 --- pkgs/applications/misc/surface-control/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/surface-control/default.nix b/pkgs/applications/misc/surface-control/default.nix index d8af8fe07c2..e4409d1ac76 100644 --- a/pkgs/applications/misc/surface-control/default.nix +++ b/pkgs/applications/misc/surface-control/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "surface-control"; - version = "0.4.3-1"; + version = "0.4.3-2"; src = fetchFromGitHub { owner = "linux-surface"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bqrp/XS4OJIRW2ChHnf9gMh/TgCPUEb9fP2soeT1Qe4="; + sha256 = "sha256-QgkUxT5Ae0agvalZl1ie+1LwxgaTzMrKpQY3KkpWwG4="; }; - cargoSha256 = "sha256-TWXK36cN8WuqfrMX7ybO2lnNiGnSKmfK6QGWMBM1y0o="; + cargoSha256 = "sha256-LPcN5xWOrl+MYVDKRIAlJoDepSSE9LTEN4fUS7bPS2U="; nativeBuildInputs = [ pkg-config installShellFiles ]; buildInputs = [ udev ]; From c9e344912b5d0dae7184e3e228d95693d65f673d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Oct 2022 06:24:00 +0000 Subject: [PATCH 017/108] csound-manual: 6.17.0 -> 6.18.0 --- pkgs/applications/audio/csound/csound-manual/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/pkgs/applications/audio/csound/csound-manual/default.nix index 53c1340ba2a..ffb4821d767 100644 --- a/pkgs/applications/audio/csound/csound-manual/default.nix +++ b/pkgs/applications/audio/csound/csound-manual/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "csound-manual"; - version = "6.17.0"; + version = "6.18.0"; src = fetchFromGitHub { owner = "csound"; repo = "manual"; rev = version; - sha256 = "sha256-8X9Egn/MIwlNDEKUmEEz4Dnw6rGa37jRjYsVEt8ziW8="; + sha256 = "sha256-W8MghqUBr3V7LPgNwU6Ugw16wdK3G37zAPuasMlZ2+I="; }; prePatch = '' From c3df8b7855909c181b73b01107e0223c5d39889e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Oct 2022 12:07:07 +0000 Subject: [PATCH 018/108] dbmate: 1.15.0 -> 1.16.0 --- pkgs/development/tools/database/dbmate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 5acfd6ea998..09c3fce04de 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dbmate"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "v${version}"; - sha256 = "sha256-eBes5BqoR7K6ntCKjWECwWuoTwAodNtLqcTei5WocLU="; + sha256 = "sha256-6M7ruiBjvXO6LTdZNuGwUIVwa3QzdBQo0Y34UslCGAE="; }; - vendorSha256 = "sha256-U9VTS0rmLHxweFiIcFyoybHMBihy5ezloDC2iLc4IMc="; + vendorSha256 = "sha256-DwQUrNBfKZaVIpqI8yI/C9CQF5Ok/sApOrsLeIxt3hM="; doCheck = false; From b1c253feba8c73dd18be20653fffb7e542699df3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Oct 2022 22:03:09 +0000 Subject: [PATCH 019/108] nwg-launchers: 0.6.3 -> 0.7.1.1 --- pkgs/applications/misc/nwg-launchers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/nwg-launchers/default.nix b/pkgs/applications/misc/nwg-launchers/default.nix index 24deebce178..34600bb351e 100644 --- a/pkgs/applications/misc/nwg-launchers/default.nix +++ b/pkgs/applications/misc/nwg-launchers/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "nwg-launchers"; - version = "0.6.3"; + version = "0.7.1.1"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QWDYy0TBxoYxfRAOtAEVM8wsPUi2SnzMXsu38guAURU="; + sha256 = "sha256-+waoJHU/QrVH7o9qfwdvFTFJzTGLcV9CeYPn3XHEAkM="; }; nativeBuildInputs = [ From 600a5eb28957b89a38a37f695b926f9ce65ea479 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Oct 2022 18:57:47 +0000 Subject: [PATCH 020/108] irqbalance: 1.9.0 -> 1.9.2 --- pkgs/os-specific/linux/irqbalance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index d09b5f38f91..585c1661b8a 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "irqbalance"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "irqbalance"; repo = "irqbalance"; rev = "v${version}"; - sha256 = "sha256-OifGlOUT/zFz5gussEmLL24w4AovGeyNfbg/yCfzerw="; + sha256 = "sha256-dk5gdDCXNELTlbZ34gUOVwPHvXF3N07v/ZqeNVfGTGw="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From ae9790ebe658336d89feaea979053163983a56e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Nov 2022 14:41:15 +0000 Subject: [PATCH 021/108] remarkable-mouse: 7.0.3 -> 7.1.1 --- .../applications/misc/remarkable/remarkable-mouse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix index d6ec124f745..64baaf5d1b0 100644 --- a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix +++ b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "remarkable-mouse"; - version = "7.0.3"; + version = "7.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-e6xJBZmWXAPOHNNUMOGLjbe3QmvW0SRwfMNJVZsM3gw="; + sha256 = "sha256-82P9tE3jiUlKBGZCiWDoL+9VJ06Bc+If+aMfcEEU90U="; }; propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ]; From 3f6b17e9e2503b5a51d0a53c13264cbb703240bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Nov 2022 14:25:29 +0000 Subject: [PATCH 022/108] azure-storage-azcopy: 10.16.0 -> 10.16.2 --- pkgs/development/tools/azcopy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index c4572f9e1bf..55c6a347587 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.16.0"; + version = "10.16.2"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "sha256-FLrYovepVOE1NUB46Kc8z/l5o6IMFbJyY3smxPyuIsI="; + sha256 = "sha256-Pab4IYktNWWTudAY7Zx9dI+fRp0yihD78L0MmBHxeNY="; }; subPackages = [ "." ]; From 78898fa218991593988d5fb88de06ac22e4b6894 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Nov 2022 17:16:20 +0000 Subject: [PATCH 023/108] elasticmq-server-bin: 1.3.9 -> 1.3.14 --- pkgs/servers/elasticmq-server-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix index 8fa65600e9a..cdef822ee7d 100644 --- a/pkgs/servers/elasticmq-server-bin/default.nix +++ b/pkgs/servers/elasticmq-server-bin/default.nix @@ -3,11 +3,11 @@ let elasticmq-server = stdenv.mkDerivation rec { pname = "elasticmq-server"; - version = "1.3.9"; + version = "1.3.14"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${pname}-${version}.jar"; - sha256 = "sha256-+l7QX/2HrcPuAJ3kHPAKx1yWtF5mkODzoFjYIPxc6oU="; + sha256 = "sha256-diTfRYV51d9QYx1E6ZbSSaM6qDIaqVPum9qsBagIcec="; }; # don't do anything? From f26a48275eaa7f71722a2a0c0d5b7550c29bb17a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Nov 2022 08:45:46 +0000 Subject: [PATCH 024/108] kube-router: 1.5.1 -> 1.5.3 --- pkgs/applications/networking/cluster/kube-router/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index 2b88d1ddd24..cb349e0c563 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube-router"; - version = "1.5.1"; + version = "1.5.3"; src = fetchFromGitHub { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-J/wQyrEEdBki8bq1Qesgu4Kqj2w33zzvEEOecFdiGak="; + sha256 = "sha256-aO72wvq31kue75IKfEByhKxUwSSGGmPLzHDBSvTChTM="; }; vendorSha256 = "sha256-+3uTIaXuiwbU0fUgn2th4RNDQ5gCDi3ntPMu92S+mXc="; From 512fafc446ded1ce304016979e5c1c4616b0cb02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Dec 2022 05:10:28 +0000 Subject: [PATCH 025/108] basex: 10.2 -> 10.4 --- pkgs/tools/text/xml/basex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index 36d7dea4cea..387e3735c7c 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "basex"; - version = "10.2"; + version = "10.4"; src = fetchurl { url = "http://files.basex.org/releases/${version}/BaseX${builtins.replaceStrings ["."] [""] version}.zip"; - hash = "sha256-byx1gY/tzUmdi120tQzUywj9XroLyxYVMb4UilkChNk="; + hash = "sha256-lwPEy4VVe2D36T3t0vnEodL6L8/Q6adOTGqWI0m7YpM="; }; nativeBuildInputs = [ unzip copyDesktopItems ]; From f4170e0ab28461d9884b27b9aef648edf498fc8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Dec 2022 06:37:06 +0000 Subject: [PATCH 026/108] commonsDaemon: 1.3.1 -> 1.3.3 --- pkgs/development/libraries/java/commons/daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/commons/daemon/default.nix b/pkgs/development/libraries/java/commons/daemon/default.nix index e41c475c829..dbecabec2d5 100644 --- a/pkgs/development/libraries/java/commons/daemon/default.nix +++ b/pkgs/development/libraries/java/commons/daemon/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.3.1"; + version = "1.3.3"; pname = "commons-daemon"; src = fetchurl { url = "mirror://apache/commons/daemon/binaries/commons-daemon-${version}-bin.tar.gz"; - sha256 = "sha256-EaQ4wy32GX1MGByCqo811WblqZgsNSw3psr94lrxEqw="; + sha256 = "sha256-FVWmj20LiigRvfK82363Wy8/ie9+wlIlRx49AwQnhOA="; }; installPhase = '' From bc42cb997fc98c29a0eea6af4951ed3a44ca761a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Dec 2022 23:28:51 +0000 Subject: [PATCH 027/108] rgbds: 0.6.0 -> 0.6.1 --- pkgs/development/compilers/rgbds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index 955635d3f84..b58f24c151a 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "rgbds"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "gbdev"; repo = "rgbds"; rev = "v${version}"; - sha256 = "sha256-2nyjI6z6W959/Yc8EwdQVmGnG0PKwsndPLmeDlNpj18="; + sha256 = "sha256-3mx4yymrOQnP5aJCzPWl5G96WBxt1ixU6tdzhhOsF04="; }; nativeBuildInputs = [ bison flex pkg-config ]; buildInputs = [ libpng ]; From 56172aec1a5354e5462f2c3a8777e368739ba697 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Dec 2022 05:14:51 +0000 Subject: [PATCH 028/108] bctoolbox: 5.1.17 -> 5.2.0 --- pkgs/development/libraries/bctoolbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 2bc457cac18..9091749db44 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "5.1.17"; + version = "5.2.0"; nativeBuildInputs = [ cmake @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-p1rpFFMCYG/c35lqQT673j/Uicxe+PLhaktQfM6uF8Y="; + sha256 = "sha256-HbKo5E1K+W5tPqRbcG4+ymUXv87iqc094pTeng94Aao="; }; # Do not build static libraries From 69b683ad17c8f0860a67790b9accf30af4951de7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Dec 2022 16:02:54 +0000 Subject: [PATCH 029/108] cglm: 0.8.5 -> 0.8.8 --- pkgs/development/libraries/cglm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/development/libraries/cglm/default.nix index 5929c9dcbd3..d21c0243bf3 100644 --- a/pkgs/development/libraries/cglm/default.nix +++ b/pkgs/development/libraries/cglm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cglm"; - version = "0.8.5"; + version = "0.8.8"; src = fetchFromGitHub { owner = "recp"; repo = "cglm"; rev = "v${version}"; - sha256 = "sha256-PJHDZXc0DD/d+K/4uouv5F8gAf1sE5e3jLkGILPMpnI="; + sha256 = "sha256-BzZb8NDgf1NnkZaaxs+0YlVuYod/uiWJxA3geaYN7e0="; }; nativeBuildInputs = [ cmake ]; From 9d00dfc285fafffe2044590550b7c8e6c575bbb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Dec 2022 23:39:41 +0000 Subject: [PATCH 030/108] erlang-ls: 0.41.2 -> 0.46.1 --- pkgs/development/beam-modules/erlang-ls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index d35339ea0a8..2a5ff4f3ed6 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper , stdenv, writeScript, lib }: let - version = "0.41.2"; + version = "0.46.1"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -24,7 +24,7 @@ rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "sha256-LUgiQtK0OsdTmg1jEdxJ0x+39U3PXoFYsGlOv4l7/Ig="; + sha256 = "sha256-UiXnamLl6Brp+XOsoldeahNxJ9OKEUgSs1WLRmB9yL8="; rev = version; }; releaseType = "escript"; From 2c3439ef741cf13e341d72a36977551f23ea31a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Dec 2022 10:05:35 +0000 Subject: [PATCH 031/108] besu: 22.7.6 -> 22.10.3 --- pkgs/applications/blockchains/besu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/besu/default.nix b/pkgs/applications/blockchains/besu/default.nix index 68ddcca4a13..7993887be65 100644 --- a/pkgs/applications/blockchains/besu/default.nix +++ b/pkgs/applications/blockchains/besu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "besu"; - version = "22.7.6"; + version = "22.10.3"; src = fetchurl { url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-nlOIUvFv05uITEw0K+qtgT4zqySJBjTAHu49N9wdqJM="; + sha256 = "sha256-chP5RFqEoZbpSuGHfG/bHlHTe/sZYV2gLvUSHU9A44w="; }; nativeBuildInputs = [ makeWrapper ]; From 336925f7c4ad7a2f2f62279c6eaa3f69c3b02033 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Thu, 10 Nov 2022 16:44:09 +0100 Subject: [PATCH 032/108] amdvlk: 2022.Q3.5 -> 2022.Q4.4 --- pkgs/development/libraries/amdvlk/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 0895698378d..4fd87c69d71 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2022.Q3.5"; + version = "2022.Q4.4"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "YY9/njuzGONqAtbM54OGGvC1V73JyL+IHkLSZs4JSYs="; + sha256 = "sha256-MKU7bfjrvH4M2kON2tr5463nYjN1xoGAknsC9YmklEc="; }; buildInputs = [ @@ -68,6 +68,7 @@ in stdenv.mkDerivation rec { xorg.libX11 xorg.libxcb xorg.libxshmfence + zlib ]; cmakeDir = "../drivers/xgl"; From 84463a443e3c74d61320395fe11d04b8c0e82fdf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Dec 2022 03:14:14 +0000 Subject: [PATCH 033/108] trillian: 1.5.0 -> 1.5.1 --- pkgs/tools/misc/trillian/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/trillian/default.nix b/pkgs/tools/misc/trillian/default.nix index 4a76a3a0045..c437369c91b 100644 --- a/pkgs/tools/misc/trillian/default.nix +++ b/pkgs/tools/misc/trillian/default.nix @@ -5,14 +5,14 @@ buildGoModule rec { pname = "trillian"; - version = "1.5.0"; - vendorSha256 = "sha256-235uQK4E/GLl5XLBd6lkTIgWIjT9MZZGnyfZbOoTFo0="; + version = "1.5.1"; + vendorSha256 = "sha256-L2aZYwlJq9yVaaKgxa9NoqXTKD/pUq2OMiFftP364Kw="; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XZHVGuIN+5mFbaxOprhdHlpgz2NE2NsJxGWJciDMUqI="; + sha256 = "sha256-v5feUTiK6ql0YcRR6RDAj+pS/PZ7vDnSf0ue2rtWb8k="; }; subPackages = [ From 6099bd12c3614a44b19f3d4ed1d20140abc4e76c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Dec 2022 08:04:25 +0000 Subject: [PATCH 034/108] vk-bootstrap: 0.5 -> 0.6 --- pkgs/development/libraries/vk-bootstrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vk-bootstrap/default.nix b/pkgs/development/libraries/vk-bootstrap/default.nix index 8b7ce6cd930..ef76d6db9db 100644 --- a/pkgs/development/libraries/vk-bootstrap/default.nix +++ b/pkgs/development/libraries/vk-bootstrap/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "vk-bootstrap"; - version = "0.5"; + version = "0.6"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "charles-lunarg"; repo = "vk-bootstrap"; rev = "v${version}"; - sha256 = "sha256-rKyfUWfRYiVNzLWh6y44ASHW4j+yabY0kZTdZi8j2Dc="; + sha256 = "sha256-T24SCJSGta4yuK58NcQnMeiO3sg9P9/O3kaFJFO/eOE="; }; postPatch = '' From 0b7ec912c93e1aa0d8ce5377480a223c9b5b441c Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Tue, 20 Dec 2022 14:06:26 +0100 Subject: [PATCH 035/108] vulkan-cts: init at 1.3.4.1 --- pkgs/tools/graphics/vulkan-cts/default.nix | 147 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 149 insertions(+) create mode 100644 pkgs/tools/graphics/vulkan-cts/default.nix diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/tools/graphics/vulkan-cts/default.nix new file mode 100644 index 00000000000..a5581e7d6f1 --- /dev/null +++ b/pkgs/tools/graphics/vulkan-cts/default.nix @@ -0,0 +1,147 @@ +{ lib, stdenv +, fetchFromGitHub +, fetchurl +, cmake +, libdrm +, libglvnd +, libffi +, libpng +, libX11 +, libXau +, libXdmcp +, libxcb +, makeWrapper +, ninja +, pkg-config +, python3 +, vulkan-loader +, wayland +, wayland-protocols +, zlib +}: +let + renderdoc = fetchurl { + url = "https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h"; + hash = "sha256-57XwqlsbDq3GOhxiTAyn9a8TOqhX1qQnGw7z0L22ho4="; + }; + + # The build system expects all these dependencies inside the external folder and + # does not search for system-wide installations. + # It also expects the version specified in the repository, which can be incompatible + # with the version in nixpkgs (e.g. for SPIRV-Headers), so we don't want to patch in our packages. + amber = fetchFromGitHub { + owner = "google"; + repo = "amber"; + rev = "8b145a6c89dcdb4ec28173339dd176fb7b6f43ed"; + hash = "sha256-+xFYlUs13khT6r475eJJ+XS875h2sb+YbJ8ZN4MOSAA="; + }; + jsoncpp = fetchFromGitHub { + owner = "open-source-parsers"; + repo = "jsoncpp"; + rev = "9059f5cad030ba11d37818847443a53918c327b1"; + hash = "sha256-m0tz8w8HbtDitx3Qkn3Rxj/XhASiJVkThdeBxIwv3WI="; + }; + glslang = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "glslang"; + rev = "22d39cd684d136a81778cc17a0226ffad40d1cee"; + hash = "sha256-6LplxN7HOMK1NfeD32P5JAMpCBlouttxLEOT/XTVpLw="; + }; + spirv-tools = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Tools"; + rev = "b930e734ea198b7aabbbf04ee1562cf6f57962f0"; + hash = "sha256-NWpFSRoxtYWi+hLUt9gpw0YScM3shcUwv9yUmbivRb0="; + }; + spirv-headers = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Headers"; + rev = "36c0c1596225e728bd49abb7ef56a3953e7ed468"; + hash = "sha256-t1UMJnYONWOtOxc9zUgxr901QFNvqkgurjpFA8UzhYc="; + }; + vulkan-docs = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Docs"; + rev = "135da3a538263ef0d194cab25e2bb091119bdc42"; + hash = "sha256-VZ8JxIuOEG7IjsVcsJOcC+EQeZbd16/+czLcO9t7dY4="; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "vulkan-cts"; + version = "1.3.4.1"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "VK-GL-CTS"; + rev = "${finalAttrs.pname}-${finalAttrs.version}"; + hash = "sha256-XUFlYdudyRqa6iupB8N5QkUpumasyLLQEWcr4M4uP1g="; + }; + + outputs = [ "out" "lib" ]; + + prePatch = '' + mkdir -p external/renderdoc/src external/spirv-headers external/vulkan-docs + + cp -r ${renderdoc} external/renderdoc/src/renderdoc_app.h + + cp -r ${amber} external/amber/src + cp -r ${jsoncpp} external/jsoncpp/src + cp -r ${glslang} external/glslang/src + cp -r ${spirv-tools} external/spirv-tools/src + cp -r ${spirv-headers} external/spirv-headers/src + cp -r ${vulkan-docs} external/vulkan-docs/src + chmod u+w -R external + ''; + + buildInputs = [ + libdrm + libffi + libglvnd + libpng + libX11 + libXau + libXdmcp + libxcb + spirv-headers + spirv-tools + wayland + wayland-protocols + zlib + ]; + + nativeBuildInputs = [ + cmake + glslang + makeWrapper + ninja + pkg-config + python3 + ]; + + # Fix cts cmake not coping with absolute install dirs + cmakeFlags = [ + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ]; + + postInstall = '' + mv $out $lib + + mkdir -p $out/bin $out/archive-dir + cp -a external/vulkancts/modules/vulkan/deqp-vk external/vulkancts/modules/vulkan/deqp-vksc $out/bin/ + cp -a external/vulkancts/modules/vulkan/vulkan $out/archive-dir/ + cp -a external/vulkancts/modules/vulkan/vk-default $out/ + + wrapProgram $out/bin/deqp-vk \ + --add-flags '--deqp-vk-library-path=${vulkan-loader}/lib/libvulkan.so' \ + --add-flags "--deqp-archive-dir=$out/archive-dir" + ''; + + meta = with lib; { + description = "Khronos Vulkan Conformance Tests"; + homepage = "https://github.com/KhronosGroup/VK-GL-CTS/blob/main/external/vulkancts/README.md"; + license = licenses.asl20; + maintainers = with maintainers; [ Flakebi ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d58efc3c6a..2ac88184d5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22933,6 +22933,8 @@ with pkgs; vulkan-caps-viewer = libsForQt5.callPackage ../tools/graphics/vulkan-caps-viewer { }; + vulkan-cts = callPackage ../tools/graphics/vulkan-cts { }; + vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { }; vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-loader = callPackage ../development/libraries/vulkan-loader { inherit (darwin) moltenvk; }; From 53b3a6bc4dd6b5931e6b9a4394574ee0b90d303a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Dec 2022 16:15:42 +0000 Subject: [PATCH 036/108] rssguard: 4.2.4 -> 4.2.7 --- pkgs/applications/networking/feedreaders/rssguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index e94c981e489..a5debadc800 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "4.2.4"; + version = "4.2.7"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "sha256-6JRANTUbHyMAuA7lhAQtlgJIW6l39XNUtKQMVN6FHJU="; + sha256 = "sha256-X5hZspl9IekhC8XXpZS285cmVZek2oxIV3tYOz/ZBec="; }; buildInputs = [ qtwebengine qttools ]; From b8a81fd742e777e9de0cf116f9481440c20a9ec6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jan 2023 13:53:45 +0000 Subject: [PATCH 037/108] pluto: 5.11.0 -> 5.12.0 --- pkgs/applications/networking/cluster/pluto/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix index 8fc55abe928..c9af58b1a8a 100644 --- a/pkgs/applications/networking/cluster/pluto/default.nix +++ b/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pluto"; - version = "5.11.0"; + version = "5.12.0"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - sha256 = "sha256-eyJ81i9kTuojBuo/rwfgnl3BRpiTnKst0SnL+oWfSWQ="; + sha256 = "sha256-WE/XWNBy5p8PEQ11s8nmW+HoVEkQB9cKoj5ZS8Suvs8="; }; - vendorSha256 = "sha256-QH/mKq7QydYvUHZIPjoBWy015Sghh30VdEWu76KZdPE="; + vendorHash = "sha256-F5Vh9wPd53bifLStk6wEwidPZvOjN87jn4RxJbSuW4o="; ldflags = [ "-w" "-s" From 0f5cf127fd8a7ceed19fa3591516d24361983b77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jan 2023 21:18:12 +0000 Subject: [PATCH 038/108] orcania: 2.3.0 -> 2.3.2 --- pkgs/development/libraries/orcania/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/development/libraries/orcania/default.nix index abe45b63372..9acffa9285c 100644 --- a/pkgs/development/libraries/orcania/default.nix +++ b/pkgs/development/libraries/orcania/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake, check, subunit }: stdenv.mkDerivation rec { pname = "orcania"; - version = "2.3.0"; + version = "2.3.2"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QAq/6MGVj+iBHLElHuqokF1v3LU1TZ9hVVJE1s3y6f0="; + sha256 = "sha256-xF6QIXfsI+6WqshcG74/J98MgjSkYjRkTW64zeH6DDY="; }; nativeBuildInputs = [ cmake ]; From 5ebf548b742be55dcc7e157e492d501e3984dac5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Jan 2023 23:23:32 +0000 Subject: [PATCH 039/108] sickgear: 0.25.47 -> 0.25.60 --- pkgs/servers/sickbeard/sickgear.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index 8a092447c00..dbfe0f22bfa 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.25.47"; + version = "0.25.60"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "sha256-CnAJ2qpE+k8TvBD06WbZWOvlF740Xgx/Q0JWf3rJcWI="; + sha256 = "sha256-5I6hJgUN2BdHc80RrcmWWxdq0iz6rcO4aX16CDtwu/g="; }; patches = [ From 0a2917831f403e1ce3cda9995ee8b58fab829fe3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Jan 2023 22:32:42 +0000 Subject: [PATCH 040/108] featherpad: 1.3.1 -> 1.3.5 --- pkgs/applications/editors/featherpad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix index dc00e09b974..b7cca4ff3ec 100644 --- a/pkgs/applications/editors/featherpad/default.nix +++ b/pkgs/applications/editors/featherpad/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "featherpad"; - version = "1.3.1"; + version = "1.3.5"; src = fetchFromGitHub { owner = "tsujan"; repo = "FeatherPad"; rev = "V${version}"; - sha256 = "sha256-OLipBhSrXf9lLpSYLwjjOv5AYJDt46MlnEW4YetXZjI="; + sha256 = "sha256-deQDLcymci8x9QvVOfNwroZPvifovxV6+jT9Grl3sxA="; }; nativeBuildInputs = [ cmake pkg-config qttools ]; From aff371a6db958bf096e65a0467213aa37c15ae31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Jan 2023 23:40:53 +0000 Subject: [PATCH 041/108] hyperrogue: 12.1a -> 12.1h --- pkgs/games/hyperrogue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index 2370b008225..f8f0d55fb9c 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "12.1a"; + version = "12.1h"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "sha256-VmWZkIjDy/yv0g9YCW9x8b0LE5guHIA/KZc3OXJoCdA="; + sha256 = "sha256-9ChPO0YCsrAyQ81TAbKCMJSgSXoUtkvvNPMTPimPBUo="; }; CXXFLAGS = [ From 8b427b92778ba196ef41a4675df42249f2ff5511 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 13:27:13 +0000 Subject: [PATCH 042/108] nwg-drawer: 0.3.0 -> 0.3.7 --- pkgs/applications/misc/nwg-drawer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/applications/misc/nwg-drawer/default.nix index ff0127c106e..2bb14c1b298 100644 --- a/pkgs/applications/misc/nwg-drawer/default.nix +++ b/pkgs/applications/misc/nwg-drawer/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "nwg-drawer"; - version = "0.3.0"; + version = "0.3.7"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-o69ZCtIT0jh4QnlspiAh58aA61aFkkKu0FdmscHLMIk="; + sha256 = "sha256-OcOF43SOlseb6UGTxLtGH0MRokZob0x+cczpdJc8Hq4="; }; - vendorSha256 = "sha256-Twipdrt3XZVrzJvElEGbKaJRMnop8fIFMFnriPTSS14="; + vendorHash = "sha256-RehZ86XuFs1kbm9V3cgPz1SPG3izK7/6fHQjPTHOYZs="; buildInputs = [ cairo gobject-introspection gtk3 gtk-layer-shell ]; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; From 37d4c2c752f8149dbb48a20e3e4bc15b30fd79ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 04:08:40 +0000 Subject: [PATCH 043/108] smartdns: 37.1 -> 40 --- pkgs/tools/networking/smartdns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/smartdns/default.nix b/pkgs/tools/networking/smartdns/default.nix index e9259724241..d02a1ccac11 100644 --- a/pkgs/tools/networking/smartdns/default.nix +++ b/pkgs/tools/networking/smartdns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smartdns"; - version = "37.1"; + version = "40"; src = fetchFromGitHub { owner = "pymumu"; repo = pname; rev = "Release${version}"; - sha256 = "sha256-fj9NA8HLF/FdYNoS2g9KKDvqr3m41P+VU0eiVm7ku8A="; + sha256 = "sha256-Un4LUBWVwbWYK4rZY2+gdk6Zi+n36Xawma8Dok2Sa0U="; }; buildInputs = [ openssl ]; From adaa5289673eea472d9c9ced26f09f6d79fbde75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 07:31:19 +0000 Subject: [PATCH 044/108] codeql: 2.11.0 -> 2.12.0 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 27f758f39b5..ec333520ca5 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.11.0"; + version = "2.12.0"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-nY31/coUnBNkKg10SOd64sBBkV44g+eIXyKIrPq1IWU="; + sha256 = "sha256-V+UXodw84NGZPi3Ws4hKyftqnGibn9uFgrkGXxpRAZc="; }; nativeBuildInputs = [ From f30f496d9250dd90ac81ddd0e7292fb2df38a720 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 07:40:54 +0000 Subject: [PATCH 045/108] consul-template: 0.29.4 -> 0.30.0 --- pkgs/tools/system/consul-template/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index d923f74a7ff..7e8e242d7bd 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.29.4"; + version = "0.30.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - sha256 = "sha256-jFj5iVUS7qpH4Aq35KS8IDKA7PzGgire+flBpkCgwuA="; + sha256 = "sha256-Q2mNMgGnwyYXVsmP6cVVlGEs2fHUZKwrWepmmQXmNLo="; }; - vendorSha256 = "sha256-GKohljwH4/kBPoI3/RfxYsvzISv1WmVAo96sjKJrnHk="; + vendorHash = "sha256-75IFVVd4L70kEV5L7Ub9RpR9LMhkz3fB4b5eAYwkPPk="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here From 875a3567e01cf1e438de2015d3fbba475cfb04a7 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Wed, 4 Jan 2023 20:19:52 -0500 Subject: [PATCH 046/108] binaryen: 109 -> 111 --- pkgs/development/compilers/binaryen/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 96483df724c..8a85468b46c 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -4,25 +4,25 @@ stdenv.mkDerivation rec { pname = "binaryen"; - version = "109"; + version = "111"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - sha256 = "sha256-HMPoiuTvYhTDaBUfSOfh/Dt4FdO9jGqUaFpi92pnscI="; + sha256 = "sha256-wSwLs/YvrH7nswDSbtR6onOMArCdPE2zi6G7oA10U4Y="; }; patches = [ - # https://github.com/WebAssembly/binaryen/pull/4321 + # https://github.com/WebAssembly/binaryen/pull/5378 (fetchpatch { - url = "https://github.com/WebAssembly/binaryen/commit/93b8849d9f98ef7ed812938ff0b3219819c2be77.patch"; - sha256 = "sha256-Duan/B9A+occ5Lj2SbRX793xIfhzHbdYPI5PyTNCZoU="; + url = "https://github.com/WebAssembly/binaryen/commit/a96fe1a8422140072db7ad7db421378b87898a0d.patch"; + sha256 = "sha256-Wred1IoRxcQBi0nLBWpiUSgt2ApGoGsq9GkoO3mSS6o="; }) - # https://github.com/WebAssembly/binaryen/pull/4913 + # https://github.com/WebAssembly/binaryen/pull/5391 (fetchpatch { - url = "https://github.com/WebAssembly/binaryen/commit/b70fe755aa4c90727edfd91dc0a9a51febf0239d.patch"; - sha256 = "sha256-kjPLbdiMVQepSJ7J1gK6dRSMI/2SsH39k7W5AMOIrkM="; + url = "https://github.com/WebAssembly/binaryen/commit/f92350d2949934c0e0ce4a27ec8b799ac2a85e45.patch"; + sha256 = "sha256-fBwdGSIPjF2WKNnD8I0/2hnQvqevdk3NS9fAxutkZG0="; }) ]; From 275bb9b54493a116ed4ad0f7d84861a15fdbda6a Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Wed, 4 Jan 2023 22:24:16 -0500 Subject: [PATCH 047/108] emscripten: backport support for binaryen 111 --- pkgs/development/compilers/emscripten/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 3daaccd7e0b..02b1f6f03b2 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, python3, nodejs, closurecompiler , jre, binaryen , llvmPackages -, symlinkJoin, makeWrapper, substituteAll +, symlinkJoin, makeWrapper, substituteAll, fetchpatch , buildNpmPackage , emscripten }: @@ -44,6 +44,16 @@ stdenv.mkDerivation rec { src = ./0001-emulate-clang-sysroot-include-logic.patch; resourceDir = "${llvmEnv}/lib/clang/${llvmPackages.release_version}/"; }) + # https://github.com/emscripten-core/emscripten/pull/18219 + (fetchpatch { + url = "https://github.com/emscripten-core/emscripten/commit/afbc14950f021513c59cbeaced8807ef8253530a.patch"; + sha256 = "sha256-+gJNTQJng9rWcGN3GAcMBB0YopKPnRp/r8CN9RSTClU="; + }) + # https://github.com/emscripten-core/emscripten/pull/18220 + (fetchpatch { + url = "https://github.com/emscripten-core/emscripten/commit/852982318f9fb692ba1dd1173f62e1eb21ae61ca.patch"; + sha256 = "sha256-hmIOtpRx3PD3sDAahUcreSydydqcdSqArYvyLGgUgd8="; + }) ]; buildPhase = '' From 02376a27840b9363da958c2e04803919763bacba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jan 2023 15:21:08 +0000 Subject: [PATCH 048/108] intel-compute-runtime: 22.43.24595.35 -> 22.43.24595.41 --- pkgs/os-specific/linux/intel-compute-runtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index d2d7c6218ae..3e5ea984970 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "22.43.24595.35"; + version = "22.43.24595.41"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - sha256 = "sha256-CWiWkv3CmHhXAk2M92voeQ06ximSOnT9hgIA4rIxWmM="; + sha256 = "sha256-AdAQX8wurZjXHf3z8IPxnW57CDOwwYlgJ09dNNDhUYQ="; }; nativeBuildInputs = [ cmake pkg-config ]; From 876158337ff6c42b9056d565d940352b199afaa1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jan 2023 18:32:17 +0000 Subject: [PATCH 049/108] python310Packages.google-cloud-dlp: 3.10.1 -> 3.11.0 --- pkgs/development/python-modules/google-cloud-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 513d034b530..b7a2f02e0ea 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.10.1"; + version = "3.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-M7JhzttLvWMPC9AEJN/X9ofIFBtNzWGgXjnun8k1CwA="; + hash = "sha256-5zysTKqmzRAiePBwLkbUhiAG91sKwao2BCTOBnVHlYg="; }; propagatedBuildInputs = [ From 73852a5d9ee297386a828c5d704dbc90c7245f30 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jan 2023 19:14:40 +0000 Subject: [PATCH 050/108] python310Packages.google-cloud-automl: 2.9.0 -> 2.10.0 --- .../python-modules/google-cloud-automl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 51fb6d04dcf..a59f2980c68 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.9.0"; + version = "2.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8E+RvHHs4IK1RrbTtY8wwuBLNQKcDnb058vN6hKfy6Q="; + hash = "sha256-BiXbDc1nX2y1ru8+t1rrhIzFg9wLAYMj3WJhIUb6VJ8="; }; propagatedBuildInputs = [ From f5bde9dca0e2d194dc2b4ebfbc7f2ea20a7d36bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 04:19:19 +0000 Subject: [PATCH 051/108] spire: 1.4.1 -> 1.5.4 --- pkgs/tools/security/spire/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix index 3addaf3dc2c..7c7562d1adb 100644 --- a/pkgs/tools/security/spire/default.nix +++ b/pkgs/tools/security/spire/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "spire"; - version = "1.4.1"; + version = "1.5.4"; outputs = [ "out" "agent" "server" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YUsam6dIm5jDjUQ8U9puG3jvrNWCS0epaOvwo4hjixc="; + sha256 = "sha256-DHN1JL4CYnme3hPbkNPXWXsgFpJ9BIRnGPl/csr43iY="; }; - vendorSha256 = "sha256-EZWoMSBxdvnrdBmSrRYf4+2d1LCka7oUIhRAW+2n7CU="; + vendorHash = "sha256-5MveK7wZ4KpUEZ4lhm95/8bOi5NtYR4n0fSfZhC+GPo="; subPackages = [ "cmd/spire-agent" "cmd/spire-server" ]; From 1e0b7ce9f4c7d700681ef67adba5313b3dac3bfc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 22:49:30 +0000 Subject: [PATCH 052/108] belcard: 5.1.12 -> 5.2.12 --- pkgs/development/libraries/belcard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index 0f251f73e81..eb0ea3c94b2 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "belcard"; - version = "5.1.12"; + version = "5.2.12"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-ZxO0Y4R04T+3K+08fEJ9krWfYSodQLrjBZYbGrKOrXI="; + sha256 = "sha256-Q5FJ1Nh61woyXN7BVTZGNGXOVhcZXakLWcxaavPpgeY="; }; buildInputs = [ bctoolbox belr ]; From dd931ff613f885a41bb9ddd73d9406355cef8ce7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 15:06:11 +0000 Subject: [PATCH 053/108] python310Packages.google-cloud-bigquery: 3.4.1 -> 3.4.2 --- .../python-modules/google-cloud-bigquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index bc80fc531ff..cb72b6cdc52 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.4.1"; + version = "3.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iEaJcU2YojZN3px8Nn6CKMcRYQi7rXpjZd/eORY4mFs="; + hash = "sha256-Ik3DKbxa0J1hTbdlyV8LuLJPCIGz0qSFQGLKNG+IlvA="; }; propagatedBuildInputs = [ From 2c0eceb86ce8a93711d9e0fe7cb638c9d9635414 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 17:21:35 +0000 Subject: [PATCH 054/108] python310Packages.google-cloud-speech: 2.16.2 -> 2.17.0 --- .../python-modules/google-cloud-speech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 0bc05828dd1..c60c5507c96 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.16.2"; + version = "2.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aegM+pgdKsM7qC8sfPMxV74gwPYasArFWzkJ/p9ESzU="; + hash = "sha256-Lb2oV2r7CE1qc5iaxzGpIm3xZKpsORx1Nofkjno6xNs="; }; propagatedBuildInputs = [ From 184e1bd255d611d985fa5f3c7195fdd7464013c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 20 Jan 2023 11:42:04 -0800 Subject: [PATCH 055/108] python311Packages.urwid: fix tests apply https://github.com/urwid/urwid/pull/517 --- pkgs/development/python-modules/urwid/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 57e64ba97a8..6e93f6007ca 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , isPy3k , glibcLocales }: @@ -15,6 +16,15 @@ buildPythonPackage rec { sha256 = "588bee9c1cb208d0906a9f73c613d2bd32c3ed3702012f51efe318a3f2127eae"; }; + patches = [ + # https://github.com/urwid/urwid/pull/517 + (fetchpatch { + name = "python311-compat.patch"; + url = "https://github.com/urwid/urwid/commit/42c1ed1eeb663179b265bae9b384d7ec11c8a9b5.patch"; + hash = "sha256-Oz8O/M6AdqbB6C/BB5rtxp8FgdGhZUxkSxKIyq5Dmho="; + }) + ]; + # tests need to be able to set locale LC_ALL = "en_US.UTF-8"; checkInputs = [ glibcLocales ]; From ea5910f66cdc898251303e2b34d2d14333026aa0 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 1 Jan 2023 16:14:13 +0300 Subject: [PATCH 056/108] forgejo: 1.18.0-rc1-1 -> 1.18.2-0 --- .../version-management/forgejo/default.nix | 57 ++++++++++++++++--- 1 file changed, 49 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index 2cc8bb3c816..819f9bf8b71 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -1,25 +1,66 @@ -{ fetchurl, gitea, lib }: +{ lib +, stdenv +, buildGoPackage +, fetchurl +, makeWrapper +, git +, bash +, gzip +, openssh +, pam +, pamSupport ? true +, sqliteSupport ? true +}: -gitea.overrideAttrs (old: rec { +buildGoPackage rec { pname = "forgejo"; - version = "1.18.0-rc1-1"; + version = "1.18.2-0"; src = fetchurl { name = "${pname}-src-${version}.tar.gz"; # see https://codeberg.org/forgejo/forgejo/releases - url = "https://codeberg.org/attachments/976c426a-3e04-49ff-9762-47fab50624a3"; - hash = "sha256-kreBMHlMVB1UeG67zMbszGrgjaROateCRswH7GrKnEw="; + url = "https://codeberg.org/attachments/5d59ec04-9f29-4b32-a1ef-bec5c3132e26"; + hash = "sha256-RLShwdx8geyFr1Jk5qDVbsEt2hCjdrwX0lNHea7P+pk="; }; - postInstall = old.postInstall or "" + '' - mv $out/bin/{${old.pname},${pname}} + outputs = [ "out" "data" ]; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = lib.optional pamSupport pam; + + patches = [ + ./../gitea/static-root-path.patch + ]; + + postPatch = '' + substituteInPlace modules/setting/setting.go --subst-var data ''; + tags = lib.optional pamSupport "pam" + ++ lib.optionals sqliteSupport [ "sqlite" "sqlite_unlock_notify" ]; + ldflags = [ + "-X main.Version=${version}" + "-X 'main.Tags=${lib.concatStringsSep " " tags}'" + ]; + + postInstall = '' + mkdir $data + cp -R ./go/src/${goPackagePath}/{public,templates,options} $data + mkdir -p $out + cp -R ./go/src/${goPackagePath}/options/locale $out/locale + wrapProgram $out/bin/gitea \ + --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]} + ''; + + goPackagePath = "code.gitea.io/gitea"; + meta = with lib; { description = "A self-hosted lightweight software forge"; homepage = "https://forgejo.org"; changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ urandom ]; + broken = stdenv.isDarwin; }; -}) +} From f8a3c4e94fb526d108fa8564fbe1fc1b416eea5e Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 21 Jan 2023 10:16:41 +0100 Subject: [PATCH 057/108] nixos/grafana-image-renderer: use grafana freeform settings in provisioning --- nixos/modules/services/monitoring/grafana-image-renderer.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/grafana-image-renderer.nix b/nixos/modules/services/monitoring/grafana-image-renderer.nix index 60f6e84c63c..7ea17b07567 100644 --- a/nixos/modules/services/monitoring/grafana-image-renderer.nix +++ b/nixos/modules/services/monitoring/grafana-image-renderer.nix @@ -108,7 +108,7 @@ in { services.grafana.settings.rendering = mkIf cfg.provisionGrafana { url = "http://localhost:${toString cfg.settings.service.port}/render"; - callback_url = "http://localhost:${toString config.services.grafana.port}"; + callback_url = "http://localhost:${toString config.services.grafana.settings.server.http_port}"; }; services.grafana-image-renderer.chromium = mkDefault pkgs.chromium; From 9e2c8d4d8e7cffa9bcdbd1f5b0ae4ea49233ae06 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 21 Jan 2023 14:16:06 -0500 Subject: [PATCH 058/108] sic-image-cli: 0.21.0 -> 0.21.1 Diff: https://github.com/foresterre/sic/compare/v0.21.0...v0.21.1 Changelog: https://github.com/foresterre/sic/blob/v0.21.1/CHANGELOG.md --- pkgs/tools/graphics/sic-image-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/sic-image-cli/default.nix b/pkgs/tools/graphics/sic-image-cli/default.nix index a16ff4df17b..e3fbcf43885 100644 --- a/pkgs/tools/graphics/sic-image-cli/default.nix +++ b/pkgs/tools/graphics/sic-image-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sic-image-cli"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "foresterre"; repo = "sic"; rev = "v${version}"; - sha256 = "sha256-mXBiEicybtMilqXxPg8JDN0vPWT2KOFvyV+Ffo5AvlI="; + sha256 = "sha256-JSBvHbqGTwjiKRPuomXtFLgu77ZB4bOlV/JgzIxaWC0="; }; - cargoSha256 = "sha256-XuQnh+hww7/6htrYwZAF0Jl7+7lXUCDRT5/e5YwVEIo="; + cargoSha256 = "sha256-HWnYBLxiz7Kd5rmgTFeIG8XtiRzhRKuo/vunJRPLdWU="; nativeBuildInputs = [ installShellFiles nasm ]; From 50cd191b88f694669aed3c00d1f0891ab55ae2f8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 21 Jan 2023 21:13:57 +0000 Subject: [PATCH 059/108] esphome: 2022.12.3 -> 2022.12.4 https://github.com/esphome/esphome/releases/tag/2022.12.4 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 5a1f469f915..6b891dcf375 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -15,14 +15,14 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2022.12.3"; + version = "2022.12.4"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9yyfcygEmnOcaooSg9bmGGOP2aph0i6d/Ot4nGlTPw4="; + hash = "sha256-HU4S6U5v0r93z4T6JpclEF6Cw6vy0VoprVyI4Z2Ti7s="; }; postPatch = '' From 840ad971499bd686abf4a45023892490d35eea47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Sat, 21 Jan 2023 22:12:08 +0100 Subject: [PATCH 060/108] litecli: ignore failing test The issue is introduced by sqlparse 0.4.3 Resolves #211482 --- pkgs/development/tools/database/litecli/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/development/tools/database/litecli/default.nix index 98a4a27e4b5..34264dad65f 100644 --- a/pkgs/development/tools/database/litecli/default.nix +++ b/pkgs/development/tools/database/litecli/default.nix @@ -28,6 +28,10 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "litecli" ]; + disabledTests = [ + "test_auto_escaped_col_names" + ]; + meta = with lib; { description = "Command-line interface for SQLite"; longDescription = '' From 62b9dc3abb57084d9c50806c34bbee8f098fad17 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 21 Jan 2023 21:22:59 +0000 Subject: [PATCH 061/108] platformio: Relax starlette constraint --- pkgs/development/embedded/platformio/core.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index 2df7e177e92..61a09e04734 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -22,7 +22,7 @@ with python3.pkgs; buildPythonApplication rec { substituteInPlace setup.py \ --replace 'uvicorn==%s" % ("0.16.0" if PY36 else "0.19.*")' 'uvicorn>=0.16"' \ - --replace 'starlette==%s" % ("0.19.1" if PY36 else "0.21.*")' 'starlette>=0.19.1,<=0.21"' \ + --replace 'starlette==%s" % ("0.19.1" if PY36 else "0.21.*")' 'starlette>=0.19.1"' \ --replace 'tabulate==%s" % ("0.8.10" if PY36 else "0.9.*")' 'tabulate>=0.8.10,<=0.9"' \ --replace 'wsproto==' 'wsproto>=' ''; From f3d85e35055703375911ddd3e4c989689bb633fd Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Sat, 21 Jan 2023 22:04:16 +0100 Subject: [PATCH 062/108] uptime-kuma: 1.19.2 -> 1.19.6 --- .../monitoring/uptime-kuma/default.nix | 13 +- .../monitoring/uptime-kuma/node-packages.nix | 463 +++++++++--------- .../monitoring/uptime-kuma/package.json | 11 +- 3 files changed, 245 insertions(+), 242 deletions(-) diff --git a/pkgs/servers/monitoring/uptime-kuma/default.nix b/pkgs/servers/monitoring/uptime-kuma/default.nix index 83d8e1a9d52..943ee9ce158 100644 --- a/pkgs/servers/monitoring/uptime-kuma/default.nix +++ b/pkgs/servers/monitoring/uptime-kuma/default.nix @@ -4,16 +4,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "uptime-kuma"; - version = "1.19.2"; + version = "1.19.6"; src = fetchFromGitHub { owner = "louislam"; repo = "uptime-kuma"; rev = finalAttrs.version; - sha256 = "yWQ3O3sCW6YKpE8BKgJjrKmLD9NyccaqyzQOXlSCC8I="; + sha256 = "sha256-Hk0me4VPP8vKp4IhzQKjjhM2BWLGSHnN7JiDJu2WlE8="; }; - uiSha256 = "sha256-aaQB1S8PmWU7brncRwEHG5bWEcyxD3amaq7Z6vpP92o="; + uiSha256 = "sha256-oeXklGxAPsUoLRT6DAVRgWm0kvKbLFW4IBc0Rh3j5V4="; patches = [ # Fixes the permissions of the database being not set correctly @@ -21,13 +21,6 @@ stdenv.mkDerivation (finalAttrs: { ./fix-database-permissions.patch ]; - postPatch = '' - substituteInPlace server/ping-lite.js \ - --replace "/bin/ping" "${iputils}/bin/ping" \ - --replace "/sbin/ping6" "${iputils}/bin/ping" \ - --replace "/sbin/ping" "${iputils}/bin/ping" - ''; - nativeBuildInputs = [ makeWrapper ]; installPhase = '' diff --git a/pkgs/servers/monitoring/uptime-kuma/node-packages.nix b/pkgs/servers/monitoring/uptime-kuma/node-packages.nix index 41dfb46aa60..d840c3968ba 100644 --- a/pkgs/servers/monitoring/uptime-kuma/node-packages.nix +++ b/pkgs/servers/monitoring/uptime-kuma/node-packages.nix @@ -112,13 +112,13 @@ let sha512 = "aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g=="; }; }; - "@azure/msal-browser-2.32.0" = { + "@azure/msal-browser-2.32.1" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "2.32.0"; + version = "2.32.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.0.tgz"; - sha512 = "uDP0vNmIefM6+RjILGKu+zOiN+VGnEvxRfUIV5hOWOWLLkG7kcDPYG/v/EJMoG+R5DYW9jXA5nvZT76t5HdEAQ=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.1.tgz"; + sha512 = "2G3B12ZEIpiimi6/Yqq7KLk4ud1zZWoHvVd2kJ2VthN1HjMsZjdMUxeHkwMWaQ6RzO6mv9rZiuKmRX64xkXW9g=="; }; }; "@azure/msal-common-7.6.0" = { @@ -130,31 +130,40 @@ let sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; }; }; - "@azure/msal-common-9.0.0" = { + "@azure/msal-common-9.0.1" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.0.tgz"; - sha512 = "uiFiFKVNTsRpmKio5bcObTuHcaHHZB2GEsjJJN8rbJNmzoYuZzNioOoK+J0QK0jEasRBgAoR5A8hSty2iKRzIg=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.1.tgz"; + sha512 = "eNNHIW/cwPTZDWs9KtYgb1X6gtQ+cC+FGX2YN+t4AUVsBdUbqlMTnUs6/c/VBxC2AAGIhgLREuNnO3F66AN2zQ=="; }; }; - "@azure/msal-node-1.14.4" = { + "@azure/msal-common-9.0.2" = { + name = "_at_azure_slash_msal-common"; + packageName = "@azure/msal-common"; + version = "9.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.2.tgz"; + sha512 = "qzwxuF8kZAp+rNUactMCgJh8fblq9D4lSqrrIxMDzLjgSZtjN32ix7r/HBe8QdOr76II9SVVPcMkX4sPzPfQ7w=="; + }; + }; + "@azure/msal-node-1.14.6" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "1.14.4"; + version = "1.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.4.tgz"; - sha512 = "j9GzZu5mTLWtuJ+cYN6e67UNymIS5OysblrOzH8lakt9XxH0GCPYjuqbOEKTP84r+Rbj3io+TuW1KS+0Xxuj/g=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.6.tgz"; + sha512 = "em/qqFL5tLMxMPl9vormAs13OgZpmQoJbiQ/GlWr+BA77eCLoL+Ehr5xRHowYo+LFe5b+p+PJVkRvT+mLvOkwA=="; }; }; - "@babel/runtime-7.20.1" = { + "@babel/runtime-7.20.7" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.20.1"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz"; - sha512 = "mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz"; + sha512 = "UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ=="; }; }; "@breejs/later-4.1.0" = { @@ -175,22 +184,31 @@ let sha512 = "H9l79u4kJ2PVSxUNA08HMYAnUBLj9v6KjYQ7SQ71hOZcEXhShE/y5iQCesP8+6/Ik/7i2O0a10bPquIcYfufog=="; }; }; - "@grpc/proto-loader-0.7.3" = { + "@grpc/proto-loader-0.7.4" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; - version = "0.7.3"; + version = "0.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.3.tgz"; - sha512 = "5dAvoZwna2Py3Ef96Ux9jIkp3iZ62TUsV00p3wVBPNX5K178UbNi8Q7gQVqwXT1Yq9RejIGG9G2IPEo93T6RcA=="; + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.4.tgz"; + sha512 = "MnWjkGwqQ3W8fx94/c1CwqLsNmHHv2t0CFn+9++6+cDphC1lolpg9M2OU0iebIjK//pBNX9e94ho+gjx6vz39w=="; }; }; - "@js-joda/core-5.4.2" = { + "@js-joda/core-5.5.1" = { name = "_at_js-joda_slash_core"; packageName = "@js-joda/core"; - version = "5.4.2"; + version = "5.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@js-joda/core/-/core-5.4.2.tgz"; - sha512 = "QIDIZ9a0NfDStgD47VaTgwiPjlw1p4QPLwjOB/9+/DqIztoQopPNNAd+HdtQMHgE+ibP3dJacd8/TVL/A1RaaA=="; + url = "https://registry.npmjs.org/@js-joda/core/-/core-5.5.1.tgz"; + sha512 = "oTFmkyv5MhgkHdZhoe5lwRoKW0t4njPvK3g7ODvK/prkoC5bwylKcyQJMsmjvgHBXoy4u5iLnB5yQ7AljouHAA=="; + }; + }; + "@louislam/ping-0.4.2-mod.1" = { + name = "_at_louislam_slash_ping"; + packageName = "@louislam/ping"; + version = "0.4.2-mod.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@louislam/ping/-/ping-0.4.2-mod.1.tgz"; + sha512 = "KkRDo8qcF9kzzR0Hh8Iqz+XNnzKOdobUquP7UyBYrjxAB1jNT3qO0gvAZeDUknF28LXBPSzkiVlf1NG+tb/iyQ=="; }; }; "@louislam/sqlite3-15.1.2" = { @@ -382,13 +400,13 @@ let sha512 = "h7BcvPUogWbKCzBR2lY4oqaZbO3jXZksexYJVFvkrFeLgbZjQkU4x8pRq6eg2MHXQhY0McQdqmmsxRWlVAHooA=="; }; }; - "@types/cors-2.8.12" = { + "@types/cors-2.8.13" = { name = "_at_types_slash_cors"; packageName = "@types/cors"; - version = "2.8.12"; + version = "2.8.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz"; - sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="; + url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz"; + sha512 = "RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA=="; }; }; "@types/es-aggregate-error-1.0.2" = { @@ -400,22 +418,22 @@ let sha512 = "erqUpFXksaeR2kejKnhnjZjbFxUpGZx4Z7ydNL9ie8tEhXPiZTsLeUDJ6aR1F8j5wWUAtOAQWUqkc7givBJbBA=="; }; }; - "@types/express-4.17.14" = { + "@types/express-4.17.15" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.14"; + version = "4.17.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz"; - sha512 = "TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.15.tgz"; + sha512 = "Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ=="; }; }; - "@types/express-serve-static-core-4.17.31" = { + "@types/express-serve-static-core-4.17.32" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.31"; + version = "4.17.32"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz"; - sha512 = "DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.32.tgz"; + sha512 = "aI5h/VOkxOF2Z1saPy0Zsxs5avets/iaiAJYznQFm5By/pamU31xWKL//epiF4OfUA2qTOc9PV6tCUjhO8wlZA=="; }; }; "@types/http-assert-1.5.3" = { @@ -463,13 +481,13 @@ let sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ=="; }; }; - "@types/lodash-4.14.190" = { + "@types/lodash-4.14.191" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.190"; + version = "4.14.191"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.190.tgz"; - sha512 = "5iJ3FBJBvQHQ8sFhEhJfjUP+G+LalhavTkYyrAYqz5MEJG+erSv0k9KJLb6q7++17Lafk1scaTIFXcMJlwK8Mw=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz"; + sha512 = "BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ=="; }; }; "@types/long-4.0.2" = { @@ -490,22 +508,22 @@ let sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="; }; }; - "@types/node-14.18.33" = { + "@types/node-14.18.36" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.18.33"; + version = "14.18.36"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.18.33.tgz"; - sha512 = "qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.18.36.tgz"; + sha512 = "FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ=="; }; }; - "@types/node-18.11.9" = { + "@types/node-18.11.18" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.11.9"; + version = "18.11.18"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz"; - sha512 = "CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz"; + sha512 = "DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA=="; }; }; "@types/qs-6.9.7" = { @@ -1093,13 +1111,13 @@ let sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; }; }; - "colorette-2.0.16" = { + "colorette-2.0.19" = { name = "colorette"; packageName = "colorette"; - version = "2.0.16"; + version = "2.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz"; - sha512 = "hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g=="; + url = "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz"; + sha512 = "3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ=="; }; }; "combine-errors-3.0.3" = { @@ -1129,15 +1147,6 @@ let sha512 = "LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="; }; }; - "commander-7.2.0" = { - name = "commander"; - packageName = "commander"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"; - sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; - }; - }; "commander-9.4.1" = { name = "commander"; packageName = "commander"; @@ -1147,6 +1156,15 @@ let sha512 = "5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw=="; }; }; + "commander-9.5.0" = { + name = "commander"; + packageName = "commander"; + version = "9.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz"; + sha512 = "KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ=="; + }; + }; "commist-1.1.0" = { name = "commist"; packageName = "commist"; @@ -1327,13 +1345,13 @@ let sha512 = "jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="; }; }; - "dayjs-1.11.6" = { + "dayjs-1.11.7" = { name = "dayjs"; packageName = "dayjs"; - version = "1.11.6"; + version = "1.11.7"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.6.tgz"; - sha512 = "zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz"; + sha512 = "+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ=="; }; }; "debug-2.6.9" = { @@ -1354,15 +1372,6 @@ let sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; }; }; - "debug-4.3.2" = { - name = "debug"; - packageName = "debug"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; - sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; - }; - }; "debug-4.3.4" = { name = "debug"; packageName = "debug"; @@ -1597,13 +1606,13 @@ let sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; }; }; - "es-abstract-1.20.4" = { + "es-abstract-1.20.5" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.20.4"; + version = "1.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz"; - sha512 = "0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.5.tgz"; + sha512 = "7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ=="; }; }; "es-aggregate-error-1.0.9" = { @@ -1885,6 +1894,15 @@ let sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; }; }; + "get-package-type-0.1.0" = { + name = "get-package-type"; + packageName = "get-package-type"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz"; + sha512 = "pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="; + }; + }; "get-symbol-description-1.0.0" = { name = "get-symbol-description"; packageName = "get-symbol-description"; @@ -1894,13 +1912,13 @@ let sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; }; }; - "getopts-2.2.5" = { + "getopts-2.3.0" = { name = "getopts"; packageName = "getopts"; - version = "2.2.5"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/getopts/-/getopts-2.2.5.tgz"; - sha512 = "9jb7AW5p3in+IiJWhQiZmmwkpLaR/ccTWdWQCtZM66HJcHHLegowh4q4tSD7gouUyeNvFWRavfK9GXosQHDpFA=="; + url = "https://registry.npmjs.org/getopts/-/getopts-2.3.0.tgz"; + sha512 = "5eDf9fuSXwxBL6q5HX+dhDj+dslFGWzU5thZ9kNKUkcPtaPdatmUFKwHFrLb/uf/WpA4BHET+AX3Scl56cAjpA=="; }; }; "getpass-0.1.7" = { @@ -1930,6 +1948,15 @@ let sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; }; }; + "gopd-1.0.1" = { + name = "gopd"; + packageName = "gopd"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz"; + sha512 = "d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA=="; + }; + }; "graceful-fs-4.2.10" = { name = "graceful-fs"; packageName = "graceful-fs"; @@ -2047,13 +2074,13 @@ let sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; }; }; - "http-graceful-shutdown-3.1.11" = { + "http-graceful-shutdown-3.1.12" = { name = "http-graceful-shutdown"; packageName = "http-graceful-shutdown"; - version = "3.1.11"; + version = "3.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/http-graceful-shutdown/-/http-graceful-shutdown-3.1.11.tgz"; - sha512 = "tfOwKDZA8kJqDNBK2ur+o55HbhDHoflvDCDgjbmm5eAn0RhqhdlUjVygj8e258B5nn5kNsEFOl7DbXLskKrgGA=="; + url = "https://registry.npmjs.org/http-graceful-shutdown/-/http-graceful-shutdown-3.1.12.tgz"; + sha512 = "z3mH1HUwRESrauPjvjH5QuH2Ce4uLlWonPFgZnwAyxIFYROxIMcNNWwNltN+s8fHF/aGlsfQDOICHLXsabK43w=="; }; }; "http-proxy-agent-5.0.0" = { @@ -2137,13 +2164,13 @@ let sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; - "internal-slot-1.0.3" = { + "internal-slot-1.0.4" = { name = "internal-slot"; packageName = "internal-slot"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"; - sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz"; + sha512 = "tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ=="; }; }; "interpret-2.2.0" = { @@ -2506,13 +2533,13 @@ let sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; }; }; - "jsonwebtoken-8.5.1" = { + "jsonwebtoken-9.0.0" = { name = "jsonwebtoken"; packageName = "jsonwebtoken"; - version = "8.5.1"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz"; - sha512 = "XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w=="; + url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz"; + sha512 = "tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw=="; }; }; "jsprim-1.4.2" = { @@ -2578,13 +2605,13 @@ let sha512 = "UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="; }; }; - "knex-0.95.15" = { + "knex-2.4.0" = { name = "knex"; packageName = "knex"; - version = "0.95.15"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/knex/-/knex-0.95.15.tgz"; - sha512 = "Loq6WgHaWlmL2bfZGWPsy4l8xw4pOE+tmLGkPG0auBppxpI0UcK+GYCycJcqz9W54f2LiGewkCVLBm3Wq4ur/w=="; + url = "https://registry.npmjs.org/knex/-/knex-2.4.0.tgz"; + sha512 = "i0GWwqYp1Hs2yvc2rlDO6nzzkLhwdyOZKRdsMTB8ZxOs2IXQyL5rBjSbS1krowCh6V65T4X9CJaKtuIfkaPGSA=="; }; }; "leven-2.1.0" = { @@ -2695,69 +2722,6 @@ let sha512 = "z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="; }; }; - "lodash.includes-4.3.0" = { - name = "lodash.includes"; - packageName = "lodash.includes"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz"; - sha512 = "W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="; - }; - }; - "lodash.isboolean-3.0.3" = { - name = "lodash.isboolean"; - packageName = "lodash.isboolean"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz"; - sha512 = "Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="; - }; - }; - "lodash.isinteger-4.0.4" = { - name = "lodash.isinteger"; - packageName = "lodash.isinteger"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz"; - sha512 = "DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA=="; - }; - }; - "lodash.isnumber-3.0.3" = { - name = "lodash.isnumber"; - packageName = "lodash.isnumber"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz"; - sha512 = "QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw=="; - }; - }; - "lodash.isplainobject-4.0.6" = { - name = "lodash.isplainobject"; - packageName = "lodash.isplainobject"; - version = "4.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; - sha512 = "oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="; - }; - }; - "lodash.isstring-4.0.1" = { - name = "lodash.isstring"; - packageName = "lodash.isstring"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; - sha512 = "0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="; - }; - }; - "lodash.once-4.1.1" = { - name = "lodash.once"; - packageName = "lodash.once"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"; - sha512 = "Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="; - }; - }; "lodash.uniqby-4.5.0" = { name = "lodash.uniqby"; packageName = "lodash.uniqby"; @@ -2884,13 +2848,22 @@ let sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; }; }; - "minipass-3.3.4" = { + "minipass-3.3.6" = { name = "minipass"; packageName = "minipass"; - version = "3.3.4"; + version = "3.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz"; - sha512 = "I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw=="; + url = "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz"; + sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; + }; + }; + "minipass-4.0.0" = { + name = "minipass"; + packageName = "minipass"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-4.0.0.tgz"; + sha512 = "g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw=="; }; }; "minizlib-2.1.2" = { @@ -3541,6 +3514,15 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; + "q-1.5.1" = { + name = "q"; + packageName = "q"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-1.5.1.tgz"; + sha512 = "kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="; + }; + }; "qs-6.5.3" = { name = "qs"; packageName = "qs"; @@ -3604,22 +3586,22 @@ let sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; - "rechoir-0.7.0" = { + "rechoir-0.8.0" = { name = "rechoir"; packageName = "rechoir"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz"; - sha512 = "ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q=="; + url = "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz"; + sha512 = "/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ=="; }; }; - "redbean-node-0.1.4" = { + "redbean-node-0.2.0" = { name = "redbean-node"; packageName = "redbean-node"; - version = "0.1.4"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/redbean-node/-/redbean-node-0.1.4.tgz"; - sha512 = "c1U6wnTeWS0c44tn9hkJWzjGgckLNJ8sN1E2bxnnnQsULOfvEVFLf8dLMjqhyyMrZ1L1mp8UvV4OfhRtH/ZrgQ=="; + url = "https://registry.npmjs.org/redbean-node/-/redbean-node-0.2.0.tgz"; + sha512 = "bHbNgVpkLOn7i/kvfvGDVGzfDgvf20qVRm4EvQV9tD2V2nhcegYUITzAF3XSL2XVirrb5vmWy85vxM44faBnYw=="; }; }; "regenerator-runtime-0.13.11" = { @@ -3748,15 +3730,6 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "semver-5.7.1" = { - name = "semver"; - packageName = "semver"; - version = "5.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; - sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; - }; - }; "semver-6.3.0" = { name = "semver"; packageName = "semver"; @@ -4054,13 +4027,13 @@ let sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; }; - "tar-6.1.12" = { + "tar-6.1.13" = { name = "tar"; packageName = "tar"; - version = "6.1.12"; + version = "6.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.12.tgz"; - sha512 = "jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw=="; + url = "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz"; + sha512 = "jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw=="; }; }; "tarn-3.0.2" = { @@ -4216,6 +4189,15 @@ let sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; }; }; + "underscore-1.13.6" = { + name = "underscore"; + packageName = "underscore"; + version = "1.13.6"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz"; + sha512 = "+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A=="; + }; + }; "unpipe-1.0.0" = { name = "unpipe"; packageName = "unpipe"; @@ -4445,7 +4427,7 @@ let args = { name = "uptime-kuma"; packageName = "uptime-kuma"; - version = "1.19.2"; + version = "1.19.6"; src = ./.; dependencies = [ sources."@azure/abort-controller-1.1.0" @@ -4465,26 +4447,29 @@ let }) sources."@azure/keyvault-keys-4.6.0" sources."@azure/logger-1.0.3" - (sources."@azure/msal-browser-2.32.0" // { + (sources."@azure/msal-browser-2.32.1" // { dependencies = [ - sources."@azure/msal-common-9.0.0" + sources."@azure/msal-common-9.0.1" ]; }) sources."@azure/msal-common-7.6.0" - (sources."@azure/msal-node-1.14.4" // { + (sources."@azure/msal-node-1.14.6" // { dependencies = [ - sources."@azure/msal-common-9.0.0" + sources."@azure/msal-common-9.0.2" ]; }) - sources."@babel/runtime-7.20.1" + sources."@babel/runtime-7.20.7" sources."@breejs/later-4.1.0" sources."@grpc/grpc-js-1.7.3" - sources."@grpc/proto-loader-0.7.3" - sources."@js-joda/core-5.4.2" + sources."@grpc/proto-loader-0.7.4" + sources."@js-joda/core-5.5.1" + sources."@louislam/ping-0.4.2-mod.1" sources."@louislam/sqlite3-15.1.2" (sources."@mapbox/node-pre-gyp-1.0.10" // { dependencies = [ + sources."lru-cache-6.0.0" sources."semver-7.3.8" + sources."yallist-4.0.0" ]; }) sources."@protobufjs/aspromise-1.1.2" @@ -4506,19 +4491,19 @@ let sources."@types/content-disposition-0.5.5" sources."@types/cookie-0.4.1" sources."@types/cookies-0.7.7" - sources."@types/cors-2.8.12" + sources."@types/cors-2.8.13" sources."@types/es-aggregate-error-1.0.2" - sources."@types/express-4.17.14" - sources."@types/express-serve-static-core-4.17.31" + sources."@types/express-4.17.15" + sources."@types/express-serve-static-core-4.17.32" sources."@types/http-assert-1.5.3" sources."@types/http-errors-2.0.1" sources."@types/keygrip-1.0.2" sources."@types/koa-2.13.5" sources."@types/koa-compose-3.2.5" - sources."@types/lodash-4.14.190" + sources."@types/lodash-4.14.191" sources."@types/long-4.0.2" sources."@types/mime-3.0.1" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/serve-static-1.15.0" @@ -4585,6 +4570,7 @@ let sources."cliui-7.0.4" sources."code-point-at-1.1.0" sources."color-support-1.1.3" + sources."colorette-2.0.19" sources."combine-errors-3.0.3" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" @@ -4626,7 +4612,7 @@ let sources."css-what-6.1.0" sources."custom-error-instance-2.1.1" sources."dashdash-1.14.1" - sources."dayjs-1.11.6" + sources."dayjs-1.11.7" (sources."debug-4.3.4" // { dependencies = [ sources."ms-2.1.2" @@ -4665,7 +4651,7 @@ let sources."engine.io-parser-5.0.4" sources."entities-4.4.0" sources."env-paths-2.2.1" - sources."es-abstract-1.20.4" + sources."es-abstract-1.20.5" sources."es-aggregate-error-1.0.9" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" @@ -4698,7 +4684,12 @@ let sources."form-data-4.0.0" sources."forwarded-0.2.0" sources."fresh-0.5.2" - sources."fs-minipass-2.1.0" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" @@ -4707,11 +4698,13 @@ let sources."generate-function-2.3.1" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.3" + sources."get-package-type-0.1.0" sources."get-symbol-description-1.0.0" - sources."getopts-2.2.5" + sources."getopts-2.3.0" sources."getpass-0.1.7" sources."glob-7.2.3" sources."globalthis-1.0.3" + sources."gopd-1.0.1" sources."graceful-fs-4.2.10" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -4725,7 +4718,7 @@ let sources."hoek-6.1.3" sources."htmlparser2-8.0.1" sources."http-errors-1.8.1" - sources."http-graceful-shutdown-3.1.11" + sources."http-graceful-shutdown-3.1.12" sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.1" sources."human-interval-2.0.1" @@ -4733,7 +4726,7 @@ let sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."internal-slot-1.0.3" + sources."internal-slot-1.0.4" sources."interpret-2.2.0" sources."ip-2.0.0" sources."ipaddr.js-1.9.1" @@ -4776,21 +4769,20 @@ let sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - (sources."jsonwebtoken-8.5.1" // { + (sources."jsonwebtoken-9.0.0" // { dependencies = [ - sources."semver-5.7.1" + sources."lru-cache-6.0.0" + sources."semver-7.3.8" + sources."yallist-4.0.0" ]; }) sources."just-performance-4.3.0" sources."jwa-1.4.1" sources."jws-3.2.2" sources."jwt-decode-3.1.2" - (sources."knex-0.95.15" // { + (sources."knex-2.4.0" // { dependencies = [ - sources."colorette-2.0.16" - sources."commander-7.2.0" - sources."debug-4.3.2" - sources."ms-2.1.2" + sources."commander-9.5.0" sources."resolve-from-5.0.0" ]; }) @@ -4805,16 +4797,8 @@ let sources."lodash._stringtopath-4.8.0" sources."lodash.camelcase-4.3.0" sources."lodash.get-4.4.2" - sources."lodash.includes-4.3.0" - sources."lodash.isboolean-3.0.3" - sources."lodash.isinteger-4.0.4" - sources."lodash.isnumber-3.0.3" - sources."lodash.isplainobject-4.0.6" - sources."lodash.isstring-4.0.1" - sources."lodash.once-4.1.1" sources."lodash.uniqby-4.5.0" sources."long-4.0.0" - sources."lru-cache-6.0.0" sources."make-dir-3.1.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -4824,12 +4808,23 @@ let sources."mime-types-2.1.35" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."minipass-3.3.4" - sources."minizlib-2.1.2" + (sources."minipass-4.0.0" // { + dependencies = [ + sources."yallist-4.0.0" + ]; + }) + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) sources."mkdirp-1.0.4" (sources."mqtt-4.3.7" // { dependencies = [ + sources."lru-cache-6.0.0" sources."mqtt-packet-6.10.0" + sources."yallist-4.0.0" ]; }) sources."ms-2.1.3" @@ -4838,7 +4833,12 @@ let sources."commander-9.4.1" ]; }) - sources."mysql2-2.3.3" + (sources."mysql2-2.3.3" // { + dependencies = [ + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" + ]; + }) (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" @@ -4865,12 +4865,14 @@ let sources."are-we-there-yet-1.1.7" sources."gauge-2.7.4" sources."is-fullwidth-code-point-1.0.0" + sources."lru-cache-6.0.0" sources."npmlog-4.1.2" sources."readable-stream-2.3.7" sources."semver-7.3.8" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" + sources."yallist-4.0.0" ]; }) sources."node-radius-client-1.0.0" @@ -4938,6 +4940,7 @@ let sources."psl-1.9.0" sources."pump-3.0.0" sources."punycode-2.1.1" + sources."q-1.5.1" sources."qs-6.5.3" sources."radius-1.1.4" sources."range-parser-1.2.1" @@ -4948,10 +4951,10 @@ let ]; }) sources."readable-stream-3.6.0" - sources."rechoir-0.7.0" - (sources."redbean-node-0.1.4" // { + sources."rechoir-0.8.0" + (sources."redbean-node-0.2.0" // { dependencies = [ - sources."@types/node-14.18.33" + sources."@types/node-14.18.36" ]; }) sources."regenerator-runtime-0.13.11" @@ -5013,7 +5016,11 @@ let }) sources."strip-ansi-6.0.1" sources."supports-preserve-symlinks-flag-1.0.0" - sources."tar-6.1.12" + (sources."tar-6.1.13" // { + dependencies = [ + sources."yallist-4.0.0" + ]; + }) sources."tarn-3.0.2" sources."tcp-ping-0.1.1" sources."tdigest-0.1.2" @@ -5035,6 +5042,7 @@ let sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."unbox-primitive-1.0.2" + sources."underscore-1.13.6" sources."unpipe-1.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" @@ -5057,7 +5065,6 @@ let sources."xmlhttprequest-ssl-2.0.0" sources."xtend-4.0.2" sources."y18n-5.0.8" - sources."yallist-4.0.0" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" sources."yup-0.32.9" diff --git a/pkgs/servers/monitoring/uptime-kuma/package.json b/pkgs/servers/monitoring/uptime-kuma/package.json index 18ae4770fab..55c8c436ee8 100644 --- a/pkgs/servers/monitoring/uptime-kuma/package.json +++ b/pkgs/servers/monitoring/uptime-kuma/package.json @@ -1,6 +1,6 @@ { "name": "uptime-kuma", - "version": "1.19.2", + "version": "1.19.6", "license": "MIT", "repository": { "type": "git", @@ -31,6 +31,7 @@ "build-docker": "npm run build && npm run build-docker-debian && npm run build-docker-alpine", "build-docker-alpine-base": "docker buildx build -f docker/alpine-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-alpine . --push", "build-docker-debian-base": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-debian . --push", + "build-docker-builder-go": "docker buildx build -f docker/builder-go.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:builder-go . --push", "build-docker-alpine": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:$VERSION-alpine --target release . --push", "build-docker-debian": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:$VERSION -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:$VERSION-debian --target release . --push", "build-docker-nightly": "npm run build && docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push", @@ -38,7 +39,7 @@ "build-docker-nightly-amd64": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain", "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test --target pr-test . --push", "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain", - "setup": "git checkout 1.19.2 && npm ci --production && npm run download-dist", + "setup": "git checkout 1.19.6 && npm ci --production && npm run download-dist", "download-dist": "node extra/download-dist.js", "mark-as-nightly": "node extra/mark-as-nightly.js", "reset-password": "node extra/reset-password.js", @@ -60,11 +61,13 @@ "start-pr-test": "node extra/checkout-pr.js && npm install && npm run dev", "cy:test": "node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/ --e2e", "cy:run": "npx cypress run --browser chrome --headless --config-file ./config/cypress.config.js", + "cy:run:unit": "npx cypress run --browser chrome --headless --config-file ./config/cypress.frontend.config.js", "cypress-open": "concurrently -k -r \"node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/\" \"cypress open --config-file ./config/cypress.config.js\"", "build-healthcheck-armv7": "cross-env GOOS=linux GOARCH=arm GOARM=7 go build -x -o ./extra/healthcheck-armv7 ./extra/healthcheck.go" }, "dependencies": { "@grpc/grpc-js": "~1.7.3", + "@louislam/ping": "~0.4.2-mod.1", "@louislam/sqlite3": "15.1.2", "args-parser": "~1.3.0", "axios": "~0.27.0", @@ -90,7 +93,7 @@ "https-proxy-agent": "~5.0.1", "iconv-lite": "~0.6.3", "jsesc": "~3.0.2", - "jsonwebtoken": "~8.5.1", + "jsonwebtoken": "~9.0.0", "jwt-decode": "~3.1.2", "limiter": "~2.1.0", "mqtt": "~4.3.7", @@ -106,7 +109,7 @@ "prom-client": "~13.2.0", "prometheus-api-metrics": "~3.2.1", "protobufjs": "~7.1.1", - "redbean-node": "0.1.4", + "redbean-node": "~0.2.0", "socket.io": "~4.5.3", "socket.io-client": "~4.5.3", "socks-proxy-agent": "6.1.1", From 118290c00ae4713b66deddb8194757041ac57a57 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sun, 22 Jan 2023 00:20:21 +0100 Subject: [PATCH 063/108] dpdk: 22.07 -> 22.11.1 Latest LTS release. https://doc.dpdk.org/guides-22.11/rel_notes/release_22_11.html --- pkgs/os-specific/linux/dpdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 1f53dc8e834..16bf9605726 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -9,14 +9,14 @@ let mod = kernel != null; - dpdkVersion = "22.07"; + dpdkVersion = "22.11.1"; in stdenv.mkDerivation rec { pname = "dpdk"; version = "${dpdkVersion}" + lib.optionalString mod "-${kernel.version}"; src = fetchurl { url = "https://fast.dpdk.org/rel/dpdk-${dpdkVersion}.tar.xz"; - sha256 = "sha256-n2Tf3gdf21cIy2Leg4uP+4kVdf7R4dKusma6yj38m+o="; + sha256 = "sha256-3gdkZfcXSg1ScUuQcuSDenJrqsgtj+fcZEytXIz3TUw="; }; nativeBuildInputs = [ From 203e5461b25add434893bee7ba8bdfeeffffebf0 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sun, 22 Jan 2023 00:35:37 +0100 Subject: [PATCH 064/108] dpdk: simplify optimization for CPU family Make it easier optimize DPDK for a CPU family. The conservative default remains (e.g. nehalem for x86_64), but a user may override it for better utilization of recent CPU models, e.g. `{ machine = "x86-64-v4"; }` for AVX512 support. --- pkgs/os-specific/linux/dpdk/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 16bf9605726..78acb45bb3c 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -5,7 +5,13 @@ , libbsd, numactl, libbpf, zlib, libelf, jansson, openssl, libpcap, rdma-core , doxygen, python3, pciutils , withExamples ? [] -, shared ? false }: +, shared ? false +, machine ? ( + if stdenv.isx86_64 then "nehalem" + else if stdenv.isAarch64 then "generic" + else null + ) +}: let mod = kernel != null; @@ -63,8 +69,7 @@ in stdenv.mkDerivation rec { # kni kernel driver is currently not compatble with 5.11 ++ lib.optional (mod && kernel.kernelOlder "5.11") "-Ddisable_drivers=kni" ++ lib.optional (!shared) "-Ddefault_library=static" - ++ lib.optional stdenv.isx86_64 "-Dmachine=nehalem" - ++ lib.optional stdenv.isAarch64 "-Dmachine=generic" + ++ lib.optional (machine != null) "-Dmachine=${machine}" ++ lib.optional mod "-Dkernel_dir=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ++ lib.optional (withExamples != []) "-Dexamples=${builtins.concatStringsSep "," withExamples}"; From 26aa60713ee4fc010cf84fd7e1e474615fd272cc Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sun, 22 Jan 2023 02:01:57 +0100 Subject: [PATCH 065/108] pktgen: 22.04.1 -> 22.07.1 --- pkgs/os-specific/linux/pktgen/default.nix | 31 +++++++++++++++++++---- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index 0ddda99bf59..20db1cdd74f 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -1,19 +1,40 @@ -{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config -, dpdk, libbsd, libpcap, lua5_3, numactl, util-linux -, gtk2, which, withGtk ? false +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, meson +, ninja +, pkg-config +, dpdk +, libbsd +, libpcap +, lua5_3 +, numactl +, util-linux +, gtk2 +, which +, withGtk ? false }: stdenv.mkDerivation rec { pname = "pktgen"; - version = "22.04.1"; + version = "22.07.1"; src = fetchFromGitHub { owner = "pktgen"; repo = "Pktgen-DPDK"; rev = "pktgen-${version}"; - sha256 = "0gbag98i2jq0p2hpvfgc3fiqy2sark1dm72hla4sxmn3gljy3p70"; + sha256 = "sha256-wBLGwVdn3ymUTVv7J/kbQYz4WNIgV246PHg51+FStUo="; }; + patches = [ + (fetchpatch { + # Ealier DPDK deprecated some macros, which were finally removed in >= 22.11 + url = "https://github.com/pktgen/Pktgen-DPDK/commit/089ef94ac04629f7380f5e618443bcacb2cef5ab.patch"; + sha256 = "sha256-ITU/dIfu7QPpdIVYuCuDhDG9rVF+n8i1YYn9bFmQUME="; + }) + ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ From 7a8db96d4fa43f55e5cda659e45fe2fd11bd957a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 20 Jan 2023 14:45:58 -0800 Subject: [PATCH 066/108] python310Packages.pyquery: 1.4.3 -> 2.0.0 https://github.com/gawel/pyquery/blob/2.0.0/CHANGES.rst --- .../python-modules/pyquery/default.nix | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyquery/default.nix b/pkgs/development/python-modules/pyquery/default.nix index 40139c79567..0e1203b901b 100644 --- a/pkgs/development/python-modules/pyquery/default.nix +++ b/pkgs/development/python-modules/pyquery/default.nix @@ -3,18 +3,23 @@ , cssselect , fetchPypi , lxml +, pytestCheckHook , pythonOlder +, requests +, webob +, webtest }: buildPythonPackage rec { pname = "pyquery"; - version = "1.4.3"; - disabled = pythonOlder "3.5"; + version = "2.0.0"; + disabled = pythonOlder "3.7"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "00p6f1dfma65192hc72dxd506491lsq3g5wgxqafi1xpg2w1xia6"; + hash = "sha256-lj6NTpAmL/bY3sBy6pcoXcN0ovacrXd29AgqvPah2K4="; }; propagatedBuildInputs = [ @@ -22,10 +27,23 @@ buildPythonPackage rec { lxml ]; - # circular dependency on webtest - doCheck = false; pythonImportsCheck = [ "pyquery" ]; + checkInputs = [ + pytestCheckHook + requests + webob + (webtest.overridePythonAttrs (_: { + # circular dependency + doCheck = false; + })) + ]; + + pytestFlagsArray = [ + # requires network + "--deselect=tests/test_pyquery.py::TestWebScrappingEncoding::test_get" + ]; + meta = with lib; { description = "A jquery-like library for Python"; homepage = "https://github.com/gawel/pyquery"; From e8ad29a8a9f4361a386208775417fcf9470df71f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 21 Jan 2023 16:25:06 -0800 Subject: [PATCH 067/108] python310Packages.marshmallow: 3.16.0 -> 3.19.0 https://github.com/marshmallow-code/marshmallow/blob/3.19.0/CHANGELOG.rst --- pkgs/development/python-modules/marshmallow/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index d2326377174..5fcaf478f18 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "3.16.0"; + version = "3.19.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "marshmallow-code"; repo = pname; rev = version; - hash = "sha256-bR10hYViK7OrAaBpKaeM7S5XyHQZhlGUQTwH/EJ0kME="; + hash = "sha256-b1brLHM48t45bwUXk7QreLLmvTzU0sX7Uoc1ZAgGkrE="; }; propagatedBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/marshmallow-code/marshmallow/blob/${src.rev}/CHANGELOG.rst"; description = "Library for converting complex objects to and from simple Python datatypes"; homepage = "https://github.com/marshmallow-code/marshmallow"; license = licenses.mit; From 3db3e83674fdd0f6983ac763a6e73610b6fb2586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 21 Jan 2023 16:24:54 -0800 Subject: [PATCH 068/108] python310Packages.marshmallow-oneofschema: 3.0.1 -> 3.0.2 https://github.com/marshmallow-code/marshmallow-oneofschema/blob/3.0.2/CHANGELOG.rst --- .../python-modules/marshmallow-oneofschema/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix index dc00e4bc60d..3e4faf8c603 100644 --- a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix +++ b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "marshmallow-oneofschema"; - version = "3.0.1"; + version = "3.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "marshmallow-code"; repo = pname; rev = version; - hash = "sha256-x0v8WkfjGkP2668QIQiewQViYFDIS2zBWMULcDThWas="; + hash = "sha256-Em2jQmvI5IiWREeOX/JAcdOQlpwP7k+cbCirkh82sf0="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/marshmallow-code/marshmallow-oneofschema/blob/${src.rev}/CHANGELOG.rst"; description = "Marshmallow library extension that allows schema (de)multiplexing"; homepage = "https://github.com/marshmallow-code/marshmallow-oneofschema"; license = licenses.mit; From bdfb499f4074e4918bdcbe3fd85e0e63a4cb194f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 21 Jan 2023 16:25:16 -0800 Subject: [PATCH 069/108] python310Packages.apispec: add meta.changelog --- pkgs/development/python-modules/apispec/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 39a6a766285..1a85922e5dd 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/marshmallow-code/apispec/blob/${version}/CHANGELOG.rst"; description = "A pluggable API specification generator with support for the OpenAPI Specification"; homepage = "https://github.com/marshmallow-code/apispec"; license = licenses.mit; From 5ebf4e73e2c868e168e4243ba353a8685d96505d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 21 Jan 2023 16:48:11 -0800 Subject: [PATCH 070/108] python311Packages.webtest-aiohttp: fix tests apply https://github.com/sloria/webtest-aiohttp/pull/7 --- .../python-modules/webtest-aiohttp/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/webtest-aiohttp/default.nix b/pkgs/development/python-modules/webtest-aiohttp/default.nix index 7d736d92862..bfb30288120 100644 --- a/pkgs/development/python-modules/webtest-aiohttp/default.nix +++ b/pkgs/development/python-modules/webtest-aiohttp/default.nix @@ -2,6 +2,7 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytest-aiohttp , pytestCheckHook , pythonOlder @@ -22,6 +23,14 @@ buildPythonPackage rec { sha256 = "sha256-UuAz/k/Tnumupv3ybFR7PkYHwG3kH7M5oobZykEP+ao="; }; + patches = [ + (fetchpatch { + name = "python311-compat.patch"; + url = "https://github.com/sloria/webtest-aiohttp/commit/64e5ab1867ea9ef87901bb2a1a6142566bffc90b.patch"; + hash = "sha256-OKJGajqJLFMkcbGmGfU9G5hCpJaj24Gs363sI0z7YZw="; + }) + ]; + propagatedBuildInputs = [ webtest ]; From d972df3b1a41cf96d2f8f31aa8682bc9bd7a1908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 21 Jan 2023 16:50:06 -0800 Subject: [PATCH 071/108] python310Packages.webtest-aiohttp: add meta.changelog --- pkgs/development/python-modules/webtest-aiohttp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/webtest-aiohttp/default.nix b/pkgs/development/python-modules/webtest-aiohttp/default.nix index bfb30288120..34c61524f17 100644 --- a/pkgs/development/python-modules/webtest-aiohttp/default.nix +++ b/pkgs/development/python-modules/webtest-aiohttp/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/sloria/webtest-aiohttp/blob/${src.rev}/CHANGELOG.rst"; description = "Provides integration of WebTest with aiohttp.web applications"; homepage = "https://github.com/sloria/webtest-aiohttp"; license = licenses.mit; From 460e16d242243dbfb843af2b0a1825e559b392b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 16:24:30 +0100 Subject: [PATCH 072/108] python310Packages.cached-property: fix build for Python 3.11 --- .../cached-property/default.nix | 42 +++++++++++++++---- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/cached-property/default.nix b/pkgs/development/python-modules/cached-property/default.nix index 90cfc63b762..555b1ce006e 100644 --- a/pkgs/development/python-modules/cached-property/default.nix +++ b/pkgs/development/python-modules/cached-property/default.nix @@ -1,31 +1,55 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, fetchpatch , pytestCheckHook , freezegun +, pythonOlder }: buildPythonPackage rec { pname = "cached-property"; version = "1.5.2"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pydanny"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-DGI8FaEjFd2bDeBDKcA0zDCE+5I6meapVNZgycE1gzs="; }; - nativeCheckInputs = [ pytestCheckHook freezegun ]; + patches = [ + # Don't use asyncio.coroutine if it's not available, https://github.com/pydanny/cached-property/pull/267 + (fetchpatch { + name = "asyncio-coroutine.patch"; + url = "https://github.com/pydanny/cached-property/commit/297031687679762849dedeaf24aa3a19116f095b.patch"; + hash = "sha256-qolrUdaX7db4hE125Lt9ICmPNYsD/uBmQrdO4q5NG3c="; + }) + ]; + + checkInputs = [ + pytestCheckHook + freezegun + ]; disabledTests = [ # https://github.com/pydanny/cached-property/issues/131 "test_threads_ttl_expiry" ]; - meta = { + pythonImportsCheck = [ + "cached_property" + ]; + + meta = with lib; { description = "A decorator for caching properties in classes"; homepage = "https://github.com/pydanny/cached-property"; - license = lib.licenses.bsd3; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ericsagnes ]; + changelog = "https://github.com/pydanny/cached-property/releases/tag/${version}"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ ericsagnes ]; }; } From fe2df4be99ed2ee3c6754662bbbe172215fb37de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 18:32:59 +0100 Subject: [PATCH 073/108] python311Packages.softlayer: update postPatch --- .../python-modules/softlayer/default.nix | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index abdaf2d59cc..25bc231b814 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -1,50 +1,52 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , click , fetchFromGitHub , mock +, prettytable , prompt-toolkit , ptable , pygments , pytestCheckHook , pythonOlder , requests +, rich , sphinx , testtools , tkinter , urllib3 -, prettytable -, rich , zeep }: buildPythonPackage rec { pname = "softlayer"; version = "6.1.3"; - disabled = pythonOlder "3.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = pname; repo = "softlayer-python"; rev = "refs/tags/v${version}"; - sha256 = "sha256-msNW0PeDbs5iq77FBPKKWH0js/PAQz6xfbM0ycMVg5U="; + hash = "sha256-msNW0PeDbs5iq77FBPKKWH0js/PAQz6xfbM0ycMVg5U="; }; postPatch = '' substituteInPlace setup.py \ - --replace 'rich == 12.3.0' 'rich >= 12.3.0' + --replace "rich ==" "rich >=" ''; propagatedBuildInputs = [ click + prettytable prompt-toolkit ptable pygments requests - urllib3 - prettytable rich + urllib3 ]; nativeCheckInputs = [ @@ -64,14 +66,17 @@ buildPythonPackage rec { disabledTestPaths = [ # Test fails with ConnectionError trying to connect to api.softlayer.com - "tests/transports/soap_tests.py" + "tests/transports/soap_tests.py.unstable" ]; - pythonImportsCheck = [ "SoftLayer" ]; + pythonImportsCheck = [ + "SoftLayer" + ]; meta = with lib; { description = "Python libraries that assist in calling the SoftLayer API"; homepage = "https://github.com/softlayer/softlayer-python"; + changelog = "https://github.com/softlayer/softlayer-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; From a2b154b4c28659a157aa2cd9f43ef9451dd44b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 22 Jan 2023 01:35:10 +0100 Subject: [PATCH 074/108] diffoscope: 229 -> 233 --- pkgs/tools/misc/diffoscope/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 1df7ef832b0..932b4072d10 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, docutils, help2man, installShellFiles +{ lib, stdenv, fetchurl, python3Packages, docutils, help2man, installShellFiles, fetchpatch , abootimg, acl, apksigcopier, apksigner, apktool, binutils-unwrapped-all-targets, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , e2fsprogs, enjarify, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , gzip, html2text, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, ocaml, oggvideotools, openssh, openssl, pdftk, pgpdump, poppler_utils, procyon, qemu, R @@ -11,17 +11,22 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "229"; + version = "233"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-IyTBwlVqOIXERdjvZPTwxhIBPOn8Dt7QbvfBazj5J/A="; + sha256 = "sha256-A2GYnhdjkzSFnMsy99FmckiOsbRdymAdtjp55hyFLp4="; }; outputs = [ "out" "man" ]; patches = [ ./ignore_links.patch + # test_text_proper_indentation requires file >= 5.44 + (fetchpatch { + url = "https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/9fdb78ec0bbc69f1980499dfdcbf6f1dd5e55cc8.patch"; + sha256 = "sha256-F0N3L9yymj2NjeIKtSnOEDsxPe+ZTb0m/M4f8LPRHg0="; + }) ]; postPatch = '' @@ -56,6 +61,11 @@ python3Packages.buildPythonApplication rec { checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath; + pytestFlagsArray = [ + # always show more information when tests fail + "-vv" + ]; + postInstall = '' make -C doc installManPage doc/diffoscope.1 From 92d917ec334c2d96dff710b9a2b2d33ae1c1e4ec Mon Sep 17 00:00:00 2001 From: Daniel Hancock Date: Sat, 21 Jan 2023 13:47:37 +0800 Subject: [PATCH 075/108] linux_xanmod: 5.15.84 -> 5.15.89 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 5cbc94d5aba..e077050fb9d 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,8 +3,8 @@ let # These names are how they are designated in https://xanmod.org. ltsVariant = { - version = "5.15.84"; - hash = "sha256-CN3GOuwSicJ6Oa9BiKTyZg7fpzWc846v2SV9JRiOu3M="; + version = "5.15.89"; + hash = "sha256-wlb6er8L2EaqgJbmbATBdSxx1BGcJXNcsu+/4UBmYdQ="; variant = "lts"; }; From d0a31fabed3d57e807c0b8eb1d443238002cc057 Mon Sep 17 00:00:00 2001 From: "dhancock@camelot.network" Date: Sun, 22 Jan 2023 17:23:44 +0800 Subject: [PATCH 076/108] linux_xanmod: 6.1.3 -> 6.1.7 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index e077050fb9d..09562d42ec7 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -9,8 +9,8 @@ let }; mainVariant = { - version = "6.1.3"; - hash = "sha256-YtkmbbFEfvww7yJ4MpLQ3M6QjbBXSU9Pjwu0Dq/dIcs="; + version = "6.1.7"; + hash = "sha256-cgUxM40cDl4lzoF4St3ckKAtsle2PRehfSag3VaycrY="; variant = "main"; }; From 23fe71e2c5f21d7096b6cb3a2fbcb7f31ad738e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 10:48:58 +0000 Subject: [PATCH 077/108] libzdb: 3.2.2 -> 3.2.3 --- pkgs/development/libraries/libzdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix index 986f27e27c8..cfd4d38ac57 100644 --- a/pkgs/development/libraries/libzdb/default.nix +++ b/pkgs/development/libraries/libzdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "3.2.2"; + version = "3.2.3"; pname = "libzdb"; src = fetchurl { url = "https://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz"; - sha256 = "1blmy7228649iscwlldrc1ldf31nhps1ps9xfv44ms0yxqhlw7nm"; + sha256 = "sha256-oZV4Jvq3clSE/Ft0eApqfQ2Lf14uVNJuEGs5ngqGvrA="; }; buildInputs = [ sqlite ]; From c39291b0b428715b6afba7d98e291257e976cc7c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 14:33:42 +0000 Subject: [PATCH 078/108] autorestic: 1.7.4 -> 1.7.5 --- pkgs/tools/backup/autorestic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/autorestic/default.nix b/pkgs/tools/backup/autorestic/default.nix index fdd59a4713b..7bc9805117b 100644 --- a/pkgs/tools/backup/autorestic/default.nix +++ b/pkgs/tools/backup/autorestic/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "autorestic"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "cupcakearmy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Yg/R3f84nSLrfHA20Jtq28ldSK/y4c7rVm4GN4+DlDY="; + sha256 = "sha256-gf2sqMI8dG7+sVSqe2f5oG7vqQ9UDKAqPUS+MPVB7SI="; }; - vendorSha256 = "sha256-eB24vCElnnk3EMKniCblmeRsFk0BQ0wFeBf0B8OPanE="; + vendorHash = "sha256-eB24vCElnnk3EMKniCblmeRsFk0BQ0wFeBf0B8OPanE="; nativeBuildInputs = [ installShellFiles ]; From 630b4c3a38d3dd092fcffbafa0456b8f632a8e5d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 17:06:59 +0100 Subject: [PATCH 079/108] python310Packages.aiojobs: fix build - add changelog to meta --- .../python-modules/aiojobs/default.nix | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix index 937ff406ed7..38f31bbaf25 100644 --- a/pkgs/development/python-modules/aiojobs/default.nix +++ b/pkgs/development/python-modules/aiojobs/default.nix @@ -1,33 +1,40 @@ { lib +, aiohttp +, async-timeout , buildPythonPackage , fetchFromGitHub -, pythonOlder -, aiohttp -, pytestCheckHook , pytest-aiohttp -, pygments +, pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aiojobs"; version = "1.1.0"; - format = "flit"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-FHdEVt/XXmuTrPAETyod3fHJIK1wg957/+QMAhZG1xk="; + hash = "sha256-FHdEVt/XXmuTrPAETyod3fHJIK1wg957/+QMAhZG1xk="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=aiojobs/ --cov=tests/" "" + ''; + nativeBuildInputs = [ - pygments + setuptools ]; propagatedBuildInputs = [ aiohttp + async-timeout ]; checkInputs = [ @@ -42,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Jobs scheduler for managing background task (asyncio)"; homepage = "https://github.com/aio-libs/aiojobs"; + changelog = "https://github.com/aio-libs/aiojobs/blob/v${version}/CHANGES.rst"; license = licenses.asl20; maintainers = with maintainers; [ cmcdragonkai ]; }; From 0c73df84905b7ef6637fc96a4309026950359e60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 16:13:15 +0000 Subject: [PATCH 080/108] python310Packages.findpython: 0.2.2 -> 0.2.3 --- pkgs/development/python-modules/findpython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix index ba48651227b..2c8c0b616bb 100644 --- a/pkgs/development/python-modules/findpython/default.nix +++ b/pkgs/development/python-modules/findpython/default.nix @@ -15,7 +15,7 @@ let pname = "findpython"; - version = "0.2.2"; + version = "0.2.3"; in buildPythonPackage { inherit pname version; @@ -25,7 +25,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-gFV5YcBM8cjEukyjrHz3bsJ/qSeIpq9Cy3AeNFDElDA="; + hash = "sha256-wmWo/p/QVzYDHu1uWK1VUWNO8IGaocHkX6NTDltqRlY="; }; nativeBuildInputs = [ From 551e069fbe682aebe971f9a14ca0d6014127fc34 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 17:23:18 +0100 Subject: [PATCH 081/108] python310Packages.appthreat-vulnerability-db: 4.3.0 -> 4.3.1 Diff: https://github.com/AppThreat/vulnerability-db/compare/refs/tags/v4.3.0...v4.3.1 Changelog: https://github.com/AppThreat/vulnerability-db/releases/tag/v4.3.1 --- .../python-modules/appthreat-vulnerability-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 855269739a4..3fbd115edd4 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "4.3.0"; + version = "4.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-1WBaNTARe0ULWHf0g/6Jljo1yCffnJAS9ycbhGqzOUk="; + hash = "sha256-HZHHSY8a7xyJZAQLFeZ+5+CKixcquJcUkkjJTllFiyk="; }; propagatedBuildInputs = [ From ca81442a99ff2acc4a669cea3ff0555da83382e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 17:25:02 +0100 Subject: [PATCH 082/108] python310Packages.dvc-objects: add changelog to meta --- pkgs/development/python-modules/dvc-objects/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index ec02d79b3ab..45f5eccbc4d 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for DVC objects"; homepage = "https://github.com/iterative/dvc-objects"; + changelog = "https://github.com/iterative/dvc-objects/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From d37f257e6baf1621725f7e8b7f8d555a12d07a7e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 17:26:17 +0100 Subject: [PATCH 083/108] python310Packages.dvc-objects: 0.14.0 -> 0.19.0 Diff: https://github.com/iterative/dvc-objects/compare/refs/tags/0.14.0...0.19.0 Changelog: https://github.com/iterative/dvc-objects/releases/tag/0.19.0 --- pkgs/development/python-modules/dvc-objects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index 45f5eccbc4d..8af21a696a5 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.14.0"; + version = "0.19.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Refpekyr114mIGvbaAynxldA+s83EtALeLoTQO73b/M="; + hash = "sha256-jwjhRY1SMqiTZ5UJmoZb4odg3g8uC9ehPmxRU2VsH8U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From b84d40d5e1f59a619921e5d7ee7502cdb25e6ff2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 17:28:00 +0100 Subject: [PATCH 084/108] python310Packages.dvc-data: add changelog to meta --- pkgs/development/python-modules/dvc-data/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index db7a8fe62fc..29a8d835b63 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "DVC's data management subsystem"; homepage = "https://github.com/iterative/dvc-data"; + changelog = "https://github.com/iterative/dvc-data/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 6273b43743a7df55c4fcb25e816d63f6375c78c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 18:09:42 +0100 Subject: [PATCH 085/108] python310Packages.sqltrie: init at 0.0.26 --- .../python-modules/sqltrie/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/sqltrie/default.nix diff --git a/pkgs/development/python-modules/sqltrie/default.nix b/pkgs/development/python-modules/sqltrie/default.nix new file mode 100644 index 00000000000..99ccab32acd --- /dev/null +++ b/pkgs/development/python-modules/sqltrie/default.nix @@ -0,0 +1,52 @@ +{ lib +, attrs +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pygtrie +, orjson +, python +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "sqltrie"; + version = "0.0.26"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "iterative"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-QxQyxGOt6K3Q/ShdTMgI72lJML4J1+zZj1OoKyPAYVs="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + attrs + orjson + pygtrie + ]; + + # nox is not available at the moment + doCheck = false; + + pythonImportsCheck = [ + "sqltrie" + ]; + + meta = with lib; { + description = "DVC's data management subsystem"; + homepage = "https://github.com/iterative/sqltrie"; + changelog = "https://github.com/iterative/sqltrie/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7cc0f49178e..69cbea82394 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10890,6 +10890,8 @@ self: super: with self; { sqlsoup = callPackage ../development/python-modules/sqlsoup { }; + sqltrie = callPackage ../development/python-modules/sqltrie { }; + srp = callPackage ../development/python-modules/srp { }; srpenergy = callPackage ../development/python-modules/srpenergy { }; From 85256447c127db2b3e1671a26158f8677dc080ca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 18:10:15 +0100 Subject: [PATCH 086/108] python310Packages.dvc-data: 0.28.4 -> 0.35.1 Diff: https://github.com/iterative/dvc-data/compare/refs/tags/0.28.4...0.35.1 Changelog: https://github.com/iterative/dvc-data/releases/tag/0.35.1 --- pkgs/development/python-modules/dvc-data/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 29a8d835b63..a5f557c2cc6 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -8,13 +8,14 @@ , nanotime , pygtrie , pythonOlder -, shortuuid , setuptools-scm +, shortuuid +, sqltrie }: buildPythonPackage rec { pname = "dvc-data"; - version = "0.28.4"; + version = "0.35.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ocwOIhguH460+HJ0sE5Wj+KOiyG4NprJ+QaO+YtfTGU="; + hash = "sha256-MyYRkClbJDcMgwAHcESY0Bo7LgAFpDtkOVmVRUJ7jME="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -40,6 +41,7 @@ buildPythonPackage rec { nanotime pygtrie shortuuid + sqltrie ]; # Tests depend on upath which is unmaintained and only available as wheel From 5f2d29dd6b0b16e730bb1f5e319e3998f01a75f0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 18:14:03 +0100 Subject: [PATCH 087/108] python310Packages.boschshcpy: 0.2.38 -> 0.2.43 Diff: https://github.com/tschamm/boschshcpy/compare/0.2.38...0.2.43 --- pkgs/development/python-modules/boschshcpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index 3a4c59a4483..4ed9de7d17f 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.38"; + version = "0.2.43"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - sha256 = "sha256-PDS68JJsnKO2MVlNxvhlDEGuK7zlsGhCRVOLZ/TSlTM="; + sha256 = "sha256-qxJ1yt8KI3ekza1KNfRRBtpPLNC/X0q7ITPhZkS1hPM="; }; propagatedBuildInputs = [ From 0dcb8c76c058682e1ce46ae86f2722563ddc969c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 18:21:22 +0100 Subject: [PATCH 088/108] python310Packages.hahomematic: 2023.1.5 -> 2023.1.6 Changelog: https://github.com/danielperna84/hahomematic/releases/tag/2023.1.6 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 2c8f5030304..6181aa106a4 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.1.5"; + version = "2023.1.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-FBsADagMSpuClk23QCi+u7e7bi2EI3PUnYP//nb8AAc="; + sha256 = "sha256-bjONfnxJuqo0d/9K4VKyIurcpw5+RgyAij1Hm/mTeUc="; }; nativeBuildInputs = [ From c9694c96802501afc99b0ebfe82677b6db128c6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 17:56:02 +0000 Subject: [PATCH 089/108] mdbook-katex: 0.3.2 -> 0.3.3 --- pkgs/tools/text/mdbook-katex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index 2d492f645dc..1f28ca3ff4a 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.3.2"; + version = "0.3.3"; src = fetchCrate { inherit pname version; - hash = "sha256-K96zIjWIHQN20LmmiqGEBv5/gi0CzHQt/FgRC00Z/lE="; + hash = "sha256-PmNoux12A6MBlviyCy9kjGUHigBDxCiiqXlwf6Sc76I="; }; - cargoHash = "sha256-KIPP2tT9wrTrIy6YLgSCc4hgKJXT0ZJjp/ftSxs2row="; + cargoHash = "sha256-YSLJsiIkoeSAh3oUMkbk5jSW0NMdJLB6YsOt1YlGyfs="; OPENSSL_DIR = "${lib.getDev openssl}"; OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; From 1205b7cac832e8767912ac2a7d88f308a16b8699 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 19:10:51 +0100 Subject: [PATCH 090/108] python310Packages.findpython: add changelog to meta --- pkgs/development/python-modules/findpython/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix index 2c8c0b616bb..0b5ee194089 100644 --- a/pkgs/development/python-modules/findpython/default.nix +++ b/pkgs/development/python-modules/findpython/default.nix @@ -47,6 +47,7 @@ buildPythonPackage { meta = with lib; { description = "A utility to find python versions on your system"; homepage = "https://github.com/frostming/findpython"; + changelog = "https://github.com/frostming/findpython/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; From da775621419375dd377322fa53ba0675ccc17097 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sun, 22 Jan 2023 19:22:06 +0100 Subject: [PATCH 091/108] shopify-cli: 2.14.0 -> 2.34.0 --- pkgs/development/web/shopify-cli/Gemfile.lock | 18 ++++++------ pkgs/development/web/shopify-cli/gemset.nix | 28 +++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pkgs/development/web/shopify-cli/Gemfile.lock b/pkgs/development/web/shopify-cli/Gemfile.lock index 06da84ee001..79a4220d4ac 100644 --- a/pkgs/development/web/shopify-cli/Gemfile.lock +++ b/pkgs/development/web/shopify-cli/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: ast (2.4.2) - bugsnag (6.24.2) + bugsnag (6.25.1) concurrent-ruby (~> 1.0) concurrent-ruby (1.1.10) ffi (1.15.5) @@ -10,21 +10,21 @@ GEM listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - mini_portile2 (2.8.0) - nokogiri (1.13.9) + mini_portile2 (2.8.1) + nokogiri (1.14.0) mini_portile2 (~> 2.8.0) racc (~> 1.4) - parser (3.1.2.1) + parser (3.2.0.0) ast (~> 2.4.1) - racc (1.6.0) + racc (1.6.2) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - shopify-cli (2.32.0) + shopify-cli (2.34.0) bugsnag (~> 6.22) listen (~> 3.7.0) - theme-check (~> 1.11.0) - theme-check (1.11.0) + theme-check (~> 1.14.0) + theme-check (1.14.0) liquid (>= 5.4.0) nokogiri (>= 1.12) parser (~> 3) @@ -36,4 +36,4 @@ DEPENDENCIES shopify-cli BUNDLED WITH - 2.3.25 + 2.4.3 diff --git a/pkgs/development/web/shopify-cli/gemset.nix b/pkgs/development/web/shopify-cli/gemset.nix index 74b31a13653..3bc3e2edef4 100644 --- a/pkgs/development/web/shopify-cli/gemset.nix +++ b/pkgs/development/web/shopify-cli/gemset.nix @@ -15,10 +15,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vlsqawqy8jn6cy03zcqw944p323zmr2lgadbw00m5r4lqc3bll4"; + sha256 = "108q00vcx3vkr85mpayns3ini6ids807bmhl8nfham9900ric27y"; type = "gem"; }; - version = "6.24.2"; + version = "6.25.1"; }; concurrent-ruby = { groups = ["default"]; @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -77,10 +77,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; + sha256 = "1fqld4wnamj7awdr1lwdifpylqdrrg5adm8xj2jl9sc5ms3nxjjm"; type = "gem"; }; - version = "1.13.9"; + version = "1.14.0"; }; parser = { dependencies = ["ast"]; @@ -88,20 +88,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p"; + sha256 = "0zk8mdyr0322r11d63rcp5jhz4lakxilhvyvdv0ql5dw4lb83623"; type = "gem"; }; - version = "3.1.2.1"; + version = "3.2.0.0"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.2"; }; rb-fsevent = { groups = ["default"]; @@ -130,10 +130,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zwq99zlsk624g5k706daapzhwm9v4whc8l6h3yw48265b6wkdwv"; + sha256 = "0zzg2vv58s7ylbk35vfb3gj9q6wr59m18gb8sw9f2rnsgsmkivbr"; type = "gem"; }; - version = "2.32.0"; + version = "2.34.0"; }; theme-check = { dependencies = ["liquid" "nokogiri" "parser"]; @@ -141,9 +141,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0971ma7qnbbycfnlwwq3pfz8f6axcslif9dbzmgimv7ad0nrjpp2"; + sha256 = "1w5mmxnyc0h612c04x6h3xb8jjcq5l6mh2vql4138h2r2z98vdwq"; type = "gem"; }; - version = "1.11.0"; + version = "1.14.0"; }; } From e5dca17201e4a329f08a0342c50c5d538c5940a5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 13:58:08 +0100 Subject: [PATCH 092/108] python311Packages.ansiwrap: patch test --- .../python-modules/ansiwrap/default.nix | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/ansiwrap/default.nix b/pkgs/development/python-modules/ansiwrap/default.nix index 49cf4a63ba6..3dc3a8df13b 100644 --- a/pkgs/development/python-modules/ansiwrap/default.nix +++ b/pkgs/development/python-modules/ansiwrap/default.nix @@ -1,16 +1,18 @@ { lib , ansicolors , buildPythonPackage -, coverage , fetchPypi -, pytest-cov , pytestCheckHook +, pythonOlder , textwrap3 }: buildPythonPackage rec { pname = "ansiwrap"; version = "0.8.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -18,21 +20,31 @@ buildPythonPackage rec { sha256 = "ca0c740734cde59bf919f8ff2c386f74f9a369818cdc60efe94893d01ea8d9b7"; }; - nativeCheckInputs = [ + postPatch = '' + # https://github.com/jonathaneunice/ansiwrap/issues/18 + substituteInPlace test/test_ansiwrap.py \ + --replace "set(range(20, 120)).difference(LINE_LENGTHS)" "sorted(set(range(20, 120)).difference(LINE_LENGTHS))" \ + --replace "set(range(120, 400)).difference(LINE_LENGTHS)" "sorted(set(range(120, 400)).difference(LINE_LENGTHS))" + ''; + + checkInputs = [ ansicolors - coverage - pytest-cov pytestCheckHook ]; - propagatedBuildInputs = [ textwrap3 ]; + propagatedBuildInputs = [ + textwrap3 + ]; - pythonImportsCheck = [ "ansiwrap" ]; + pythonImportsCheck = [ + "ansiwrap" + ]; meta = with lib; { description = "Textwrap, but savvy to ANSI colors and styles"; homepage = "https://github.com/jonathaneunice/ansiwrap"; + changelog = "https://github.com/jonathaneunice/ansiwrap/blob/master/CHANGES.yml"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From 098cdb205648a4da56c022954a4d816b292b4643 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 19:20:48 +0100 Subject: [PATCH 093/108] python310Packages.vector: adjust inputs --- .../python-modules/vector/default.nix | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix index fcf4a306ca5..a1b153deefa 100644 --- a/pkgs/development/python-modules/vector/default.nix +++ b/pkgs/development/python-modules/vector/default.nix @@ -1,10 +1,16 @@ { lib +, awkward , buildPythonPackage , fetchPypi , hatch-vcs , hatchling +, numba , numpy +, notebook +, packaging +, papermill , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -12,6 +18,8 @@ buildPythonPackage rec { version = "0.11.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchPypi { inherit pname version; sha256 = "sha256-/e0wZDWIIm9vi37NEkIEitQj0p1M132AAO6id0eaA5Y="; @@ -21,17 +29,30 @@ buildPythonPackage rec { hatch-vcs hatchling ]; + propagatedBuildInputs = [ numpy + packaging ]; - nativeCheckInputs = [ pytestCheckHook ]; + checkInputs = [ + awkward + notebook + numba + papermill + pytestCheckHook + ]; - pythonImportsCheck = [ "vector" ]; + pythonImportsCheck = [ + "vector" + ]; + + __darwinAllowLocalNetworking = true; meta = with lib; { - description = "A Python 3.7+ library for 2D, 3D, and Lorentz vectors, especially arrays of vectors, to solve common physics problems in a NumPy-like way"; + description = "Library for 2D, 3D, and Lorentz vectors, especially arrays of vectors, to solve common physics problems in a NumPy-like way"; homepage = "https://github.com/scikit-hep/vector"; + changelog = "https://github.com/scikit-hep/vector/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ veprbl ]; }; From 7eb824334de36d6fe7a15c95a958e00a50eac319 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Sun, 22 Jan 2023 15:09:54 +0100 Subject: [PATCH 094/108] dhcpcd: avoid crash Fixes #199200 --- pkgs/tools/networking/dhcpcd/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 81c721a20a4..87162c4e0d4 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , pkg-config , udev , runtimeShellPackage @@ -18,6 +19,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-gZNXY07+0epc9E7AGyTT0/iFL+yLQkmSXcxWZ8VON2w="; }; + patches = [ + # dhcpcd with privsep SIGSYS's on dhcpcd -U + # https://github.com/NetworkConfiguration/dhcpcd/issues/147 + (fetchpatch { + url = "https://github.com/NetworkConfiguration/dhcpcd/commit/38befd4e867583002b96ec39df733585d74c4ff5.patch"; + hash = "sha256-nS2zmLuQBYhLfoPp0DOwxF803Hh32EE4OUKGBTTukE0="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev From b56418cbcb6fcce17f8ced91ed2f2581b3c1c8b3 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 22 Jan 2023 22:29:18 +0400 Subject: [PATCH 095/108] python3Packages.pygmt: fix build --- pkgs/development/python-modules/pygmt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index 9b6e8d6c2ca..43f6b207321 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { pname = "pygmt"; version = "0.8.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; From 0db47bd50ee411b5ca291e86f5daa0ee668a600a Mon Sep 17 00:00:00 2001 From: Riey Date: Sat, 26 Nov 2022 00:29:05 +0900 Subject: [PATCH 096/108] kime: 2.5.6 -> 3.0.2 --- .../from_md/release-notes/rl-2305.section.xml | 11 +++ .../manual/release-notes/rl-2305.section.md | 2 + nixos/modules/i18n/input-method/kime.nix | 68 ++++++++++--------- pkgs/tools/inputmethods/kime/default.nix | 22 +++--- 4 files changed, 61 insertions(+), 42 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index a672deb20b6..1a9d3bdb6c6 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -276,6 +276,17 @@ or configure your firewall. + + + Kime has been updated from 2.5.6 to 3.0.2 and the + i18n.inputMethod.kime.config option has + been removed. Users should use + daemonModules, + iconColor, and + extraConfig options under + i18n.inputMethod.kime instead. + + llvmPackages_rocm.llvm will not contain diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index c0518d4cd6f..2563da719f6 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -71,6 +71,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The [services.unifi-video.openFirewall](#opt-services.unifi-video.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitly set this option to `true`, or configure your firewall. +- Kime has been updated from 2.5.6 to 3.0.2 and the `i18n.inputMethod.kime.config` option has been removed. Users should use `daemonModules`, `iconColor`, and `extraConfig` options under `i18n.inputMethod.kime` instead. + - `llvmPackages_rocm.llvm` will not contain `clang` or `compiler-rt`. `llvmPackages_rocm.clang` will not contain `llvm`. `llvmPackages_rocm.clangNoCompilerRt` has been removed in favor of using `llvmPackages_rocm.clang-unwrapped`. - The EC2 image module previously detected and automatically mounted ext3-formatted instance store devices and partitions in stage-1 (initramfs), storing `/tmp` on the first discovered device. This behaviour, which only catered to very specific use cases and could not be disabled, has been removed. Users relying on this should provide their own implementation, and probably use ext4 and perform the mount in stage-2. diff --git a/nixos/modules/i18n/input-method/kime.nix b/nixos/modules/i18n/input-method/kime.nix index 29224a6bf75..e82996926b2 100644 --- a/nixos/modules/i18n/input-method/kime.nix +++ b/nixos/modules/i18n/input-method/kime.nix @@ -1,40 +1,37 @@ { config, pkgs, lib, generators, ... }: -with lib; -let - cfg = config.i18n.inputMethod.kime; - yamlFormat = pkgs.formats.yaml { }; -in -{ - options = { - i18n.inputMethod.kime = { - config = mkOption { - type = yamlFormat.type; - default = { }; - example = literalExpression '' - { - daemon = { - modules = ["Xim" "Indicator"]; - }; +let imcfg = config.i18n.inputMethod; +in { + imports = [ + (lib.mkRemovedOptionModule [ "i18n" "inputMethod" "kime" "config" ] "Use i18n.inputMethod.kime.* instead") + ]; - indicator = { - icon_color = "White"; - }; - - engine = { - hangul = { - layout = "dubeolsik"; - }; - }; - } - ''; - description = lib.mdDoc '' - kime configuration. Refer to for details on supported values. - ''; - }; + options.i18n.inputMethod.kime = { + daemonModules = lib.mkOption { + type = lib.types.listOf (lib.types.enum [ "Xim" "Wayland" "Indicator" ]); + default = [ "Xim" "Wayland" "Indicator" ]; + example = [ "Xim" "Indicator" ]; + description = lib.mdDoc '' + List of enabled daemon modules + ''; + }; + iconColor = lib.mkOption { + type = lib.types.enum [ "Black" "White" ]; + default = "Black"; + example = "White"; + description = lib.mdDoc '' + Color of the indicator icon + ''; + }; + extraConfig = lib.mkOption { + type = lib.types.lines; + default = ""; + description = lib.mdDoc '' + extra kime configuration. Refer to for details on supported values. + ''; }; }; - config = mkIf (config.i18n.inputMethod.enabled == "kime") { + config = lib.mkIf (imcfg.enabled == "kime") { i18n.inputMethod.package = pkgs.kime; environment.variables = { @@ -43,7 +40,12 @@ in XMODIFIERS = "@im=kime"; }; - environment.etc."xdg/kime/config.yaml".text = replaceStrings [ "\\\\" ] [ "\\" ] (builtins.toJSON cfg.config); + environment.etc."xdg/kime/config.yaml".text = '' + daemon: + modules: [${lib.concatStringsSep "," imcfg.kime.daemonModules}] + indicator: + icon_color: ${imcfg.kime.iconColor} + '' + imcfg.kime.extraConfig; }; # uses attributes of the linked package diff --git a/pkgs/tools/inputmethods/kime/default.nix b/pkgs/tools/inputmethods/kime/default.nix index 68a91d2bfca..fc69d47a14f 100644 --- a/pkgs/tools/inputmethods/kime/default.nix +++ b/pkgs/tools/inputmethods/kime/default.nix @@ -2,32 +2,34 @@ , withWayland ? true , withIndicator ? true, dbus, libdbusmenu , withXim ? true, xorg, cairo -, withGtk2 ? true, gtk2 , withGtk3 ? true, gtk3 +, withGtk4 ? true, gtk4 , withQt5 ? true, qt5 +, withQt6 ? false, qt6 }: let - cmake_args = lib.optionals withGtk2 ["-DENABLE_GTK2=ON"] - ++ lib.optionals withGtk3 ["-DENABLE_GTK3=ON"] - ++ lib.optionals withQt5 ["-DENABLE_QT5=ON"]; + cmake_args = lib.optionals withGtk3 ["-DENABLE_GTK3=ON"] + ++ lib.optionals withGtk4 ["-DENABLE_GTK4=ON"] + ++ lib.optionals withQt5 ["-DENABLE_QT5=ON"] + ++ lib.optionals withQt6 ["-DENABLE_QT6=ON"]; optFlag = w: (if w then "1" else "0"); in stdenv.mkDerivation rec { pname = "kime"; - version = "2.5.6"; + version = "3.0.2"; src = fetchFromGitHub { owner = "Riey"; repo = pname; rev = "v${version}"; - sha256 = "sha256-r5luI6B4IjNTbh2tzpqabokgwkmbyXrA61+F2HDEWuo="; + sha256 = "sha256-qLQ6DmV7KHhdXWR5KtO52cmXBm818zKJVj4nxsR14dc="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sha256 = "sha256-GvBnNPY51RPt+I73oet5tB/EE2UsEPKbelJZkSY3xNw="; + sha256 = "sha256-/o9b7YvrpV+IujkllFWAz6Mg4CbS9BInF8antfZ0Vsw="; }; # Replace autostart path @@ -68,6 +70,7 @@ stdenv.mkDerivation rec { export KIME_ICON_DIR=share/icons export KIME_LIB_DIR=lib export KIME_QT5_DIR=lib/qt-${qt5.qtbase.version} + export KIME_QT6_DIR=lib/qt-${qt6.qtbase.version} bash scripts/install.sh "$out" runHook postInstall ''; @@ -84,9 +87,10 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals withIndicator [ dbus libdbusmenu ] ++ lib.optionals withXim [ xorg.libxcb cairo ] - ++ lib.optionals withGtk2 [ gtk2 ] ++ lib.optionals withGtk3 [ gtk3 ] - ++ lib.optionals withQt5 [ qt5.qtbase ]; + ++ lib.optionals withGtk4 [ gtk4 ] + ++ lib.optionals withQt5 [ qt5.qtbase ] + ++ lib.optionals withQt6 [ qt6.qtbase ]; nativeBuildInputs = [ pkg-config From bccabe1d8a176b59b72f4d168d602f7bd218221e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 19 Jan 2023 11:38:32 -0800 Subject: [PATCH 097/108] python310Packages.starlette: update dependencies --- .../python-modules/starlette/default.nix | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 2166ec0ea4f..54fe677dab2 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -6,20 +6,15 @@ # runtime , ApplicationServices -, aiofiles , anyio -, contextlib2 , itsdangerous , jinja2 , python-multipart , pyyaml +, httpx , typing-extensions # tests -, requests -, aiosqlite -, databases -, httpx , pytestCheckHook , pythonOlder , trio @@ -30,7 +25,7 @@ buildPythonPackage rec { version = "0.23.1"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "encode"; @@ -49,25 +44,19 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - aiofiles anyio itsdangerous jinja2 python-multipart pyyaml - requests - ] ++ lib.optionals (pythonOlder "3.8") [ + httpx + ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions - ] ++ lib.optionals (pythonOlder "3.7") [ - contextlib2 ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; nativeCheckInputs = [ - aiosqlite - databases - httpx pytestCheckHook trio typing-extensions From 94ea920df96146ee43e1ff5694004d249d0772d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 19 Jan 2023 12:14:52 -0800 Subject: [PATCH 098/108] python310Packages.videocr: use Levenshtein --- pkgs/development/python-modules/videocr/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/videocr/default.nix b/pkgs/development/python-modules/videocr/default.nix index 1158d9fa917..0685b184c4a 100644 --- a/pkgs/development/python-modules/videocr/default.nix +++ b/pkgs/development/python-modules/videocr/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ + --replace "python-Levenshtein" "Levenshtein" \ --replace "opencv-python" "opencv" substituteInPlace videocr/constants.py \ --replace "master" "main" From 6405c525516a1e5bc115d5f307c8fd9dc2421d47 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 20 Jan 2023 16:01:45 +0100 Subject: [PATCH 099/108] python3Packages.django-login-required-middleware: init at 0.9.0 --- .../default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/django-login-required-middleware/default.nix diff --git a/pkgs/development/python-modules/django-login-required-middleware/default.nix b/pkgs/development/python-modules/django-login-required-middleware/default.nix new file mode 100644 index 00000000000..6c69ef7ef27 --- /dev/null +++ b/pkgs/development/python-modules/django-login-required-middleware/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, django +, djangorestframework +, fetchFromGitHub +, python +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "django-login-required-middleware"; + version = "0.9.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "CleitonDeLima"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-WFQ/JvKh6gkUxPV27QBd2TzwFS8hfQGmcTInTnmh6iA="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + django + ]; + + checkInputs = [ + djangorestframework + ]; + + pythonImportsCheck = [ + "login_required" + ]; + + checkPhase = '' + ${python.interpreter} -m django test --settings tests.settings + ''; + + meta = with lib; { + description = "Requires login to all requests through middleware in Django"; + homepage = "https://github.com/CleitonDeLima/django-login-required-middleware"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 30df1be0829..c6af3091cf2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2580,6 +2580,8 @@ self: super: with self; { django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { }; + django-login-required-middleware = callPackage ../development/python-modules/django-login-required-middleware { }; + django-mailman3 = callPackage ../development/python-modules/django-mailman3 { }; django-model-utils = callPackage ../development/python-modules/django-model-utils { }; From 3094ec7d17eaddb647b3ce9e62fe1030a0d35020 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 21:01:20 +0100 Subject: [PATCH 100/108] python310Packages.pytibber: 0.26.9 -> 0.26.11 Diff: https://github.com/Danielhiversen/pyTibber/compare/refs/tags/0.26.9...0.26.11 Changelog: https://github.com/Danielhiversen/pyTibber/releases/tag/0.26.11 --- pkgs/development/python-modules/pytibber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index d6ba750f162..e993567569e 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.26.9"; + version = "0.26.11"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-Gq1UPiNjNT6eoOqitY+HOg56ouCzPtz+8xaXHMwuZf8="; + hash = "sha256-FVbp7FYTzoNuwROdvKGzSnVN5nAp1hboyzNMhAu6YDY="; }; propagatedBuildInputs = [ From 5dc8c24b3f7ca2155f7dbc9b4e52119f54bda138 Mon Sep 17 00:00:00 2001 From: "\"Zack Lalanne\"" <"zack.lalanne@gmail.com"> Date: Sun, 22 Jan 2023 14:25:03 -0600 Subject: [PATCH 101/108] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 202 +++++++++--------- 1 file changed, 101 insertions(+), 101 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 729e83c6688..6b2a8bad1a6 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -498,12 +498,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2023-01-17"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "4c3ff7554d4853b5b6372c9c4a5077076977ceb7"; - sha256 = "003zdwjz7hzvv1p18fd9glqxbd0fc3f7yij05nhbyl1p52jvxaq0"; + rev = "e2b6cd07b45f8457ea183d16e483fdac3581b04f"; + sha256 = "0hx85bkbqcp94d2i1p9jd3c5n91xg1fhmm86yf7xjpx4knynsdbh"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -847,12 +847,12 @@ final: prev: barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2023-01-11"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "231d6f545afd108330bd515fc69f4cb509c97c0c"; - sha256 = "04blr13rjyjpa47y58d8hlsl6zf7wb8bsiq8q4sl57ygvp6hrz8m"; + rev = "ab0d20b2d48551340b52b3cbe8922462caa06950"; + sha256 = "10382d94lg6k7g8inwqs40ddywzm8pfg6j0m97kansag4q7c8p4j"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -1075,12 +1075,12 @@ final: prev: ccc-nvim = buildVimPluginFrom2Nix { pname = "ccc.nvim"; - version = "2022-12-25"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "4ea096a150fe2636782f6f68b97d3cff7ee28b4f"; - sha256 = "1jb4dd9bg7q2an963fnn2mclpj52bjqvfv6k642757zfasx20x6p"; + rev = "be0a8122fd77efb7b6a0d672bab10417e68fab8b"; + sha256 = "1w7km6b4r3pvnx5g5i4wndj9524klx3g4q9li8xv8z6lhdz27c15"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1795,12 +1795,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-12-25"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "95b43f67147391cf2c69e550bd001b742781d226"; - sha256 = "0rmva45znh39r4rhakk1zmqk9hrgi2d2daw8v1rfv1jd054w3vx1"; + rev = "e86b15bbcabc2cc1f20a40e7c127a424e7ad3850"; + sha256 = "1qh30yg082a6s55psa1z844n3s5z8s31pan7iywaygwcnpxhlgx6"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2083,12 +2083,12 @@ final: prev: copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; - version = "2023-01-07"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "5b911f2d8ecccc684c13fdb8af4145cca19dc3cf"; - sha256 = "13ckm0b8hgji4brmfw4dnc0spm8hslx2s4bg0vi8sll5i7vphpdd"; + rev = "6ca9b4b3eda9138406291493750a6890c927dbfa"; + sha256 = "00dfhj44hfqi66j1ayr7h424qc160l9d91wlbfb4hhbg2rcldp4l"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; @@ -2107,24 +2107,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-01-15"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "e8fedcb9fbedc60c8d0f30accdd72b53e998d8af"; - sha256 = "0nqby971cys2a6q81pcp54xc5w5rq9b0z8yw454z0fr8agw0vxvd"; + rev = "0b78334e1edcd7eb3d2038621b388ff040f035fb"; + sha256 = "0ag9f1h03s0pfiqaxclcz73sra0lwkva23dyacg53svcmpi9bpic"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-01-15"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "c3cc8cfe780449d8773392a741d5b15e7e9fc83c"; - sha256 = "1h8p3zk8xra3rhppzmyv7b8raz3vsb5rs8gmx7yylhpb70rv3l4w"; + rev = "d48f1315617092a8c0db29c2fd2d81d5e244c555"; + sha256 = "1ddzfj9gg67jz5kx4i51iyyl3js1b3k7mzxxa8pp5fh1021pi1hy"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2143,12 +2143,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-01-17"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "929adacab097dd2c36c797c8f9323886b4439a9c"; - sha256 = "1v49552gmsk5g5aprvzysqf5pqk6im9nkiyyjhns8sgva7gswvpm"; + rev = "25232d23926c28c34f462dd9a57847d90b1af969"; + sha256 = "1ycf3mfrs2a4c43mbdc3rs2kby1y2gxpp0kxilv8vp0c1idibyxr"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2769,12 +2769,12 @@ final: prev: editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2023-01-20"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "39bd110fc3fa7afa0b59e7665564b37c4b82d0a0"; - sha256 = "0xadgrkfb19c4g7gl46mj5pw29d04jdjxx21nyvzma09g94jdkam"; + rev = "ed23a49992a8adfc0a1db765cb5353adeb12f9ff"; + sha256 = "09bi47gv5xd7wf7i53kbp3d2n5xzbns408cg52faxixd001m0f71"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -3599,12 +3599,12 @@ final: prev: haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2023-01-21"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "a6082394ad65116784ea4a747a25b4831708d4e9"; - sha256 = "1mzxnlw3ml3xrsbbgsbyxn1mlnffarxz91j04g4d6vmz94a1d34w"; + rev = "6ac15db045393cb40c484b19f3903d89acf2b125"; + sha256 = "07rsq2wgdjqlav15jvaiwk4a33q6w07all7q6v7hzdpng8bmywgi"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4139,12 +4139,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-01-20"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "96d759d1cbd8b0bd0ea0a0c2987f99410272f348"; - sha256 = "0jdgrj5m7iax90djx9n75lh8y9cwhzzrzg99w9rfk5zifb02j9qh"; + rev = "cab4682d22a0451bc36a648694235621b5dd808e"; + sha256 = "0kxvb6l9pxdrs9cxh1cqf9p4y8nbfn9rx3a7zgd21h4c6126bcvh"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4499,12 +4499,12 @@ final: prev: lsp-inlayhints-nvim = buildVimPluginFrom2Nix { pname = "lsp-inlayhints.nvim"; - version = "2022-12-05"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "lvimuser"; repo = "lsp-inlayhints.nvim"; - rev = "a28c51a6362e3faa17f67749436cb5c8b55dcc6d"; - sha256 = "1hvn8y1mqd853aa2dm7156g4fvwq21qmmkicsl50czq4mf9vgvd1"; + rev = "84ca3abe8aaecbb5b30ad89e4701d4a9c821b72c"; + sha256 = "0fx0swsagjdng9m9x73wkfqnk464qk63q9wi32rhywllbm7gsflf"; }; meta.homepage = "https://github.com/lvimuser/lsp-inlayhints.nvim/"; }; @@ -4582,12 +4582,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2023-01-17"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "c1e9c2a5d0f0aa73c2544ad958c6f06973235d35"; - sha256 = "0n4pmcmqb7lynx1firq3p1g2z1xjw78b0wlbp7k3ag7ac5gfhzbf"; + rev = "b86f249cba85ec2f0f74c62b65898bade00b4413"; + sha256 = "0kbcws9dwsvjg6psfax4azd6j46n05jhkkdgsc1c4wjhyg74jas9"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -4654,12 +4654,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-01-20"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "8c23e1af82bdafa86556a36c4e075079dd167771"; - sha256 = "1ngvfnb2qh04bc5bkrjw69ksq3aslbnpzxk0fhp8lp42g0xc0984"; + rev = "5955bdd7b20854aea74dc86c7ddf9989296d52d7"; + sha256 = "0yzhz6cyhsh7aypvi0cz20wapn1xcild6llif7yvqbmvl4ygrdl5"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4751,12 +4751,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-01-20"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "9660a811b2e0bd959b63c7f7d41853b49546544d"; - sha256 = "0ckaw9dqlcgqz4p103pl3di9sk7n8rmhyfyhpnqir5089a61h2c1"; + rev = "bb88357eff0d0c69ab8ecc5985952e0a9a72175a"; + sha256 = "0hfnwjv165w1d89xd7gs11q5j8a52zj43acxaash2qaxy5hl3zpz"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -4823,12 +4823,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-01-19"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "91017a96693408ef96efe9a2513c6ace0a87dc8d"; - sha256 = "0xhc2npbpz7rhlis9cchda5pg7j5qkfxqb9qjsk86cxga1ma0c8r"; + rev = "1c11d5fdb71c1d766545e42b0dd99eda50f1e349"; + sha256 = "16g9yzwiibrjhl9ln911kw433li5av64p6nrhypj6pcf2n1dkrfc"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5183,12 +5183,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-01-20"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "1970a31188a5cbae13f676b699cd35dafb52642f"; - sha256 = "00rdairr0rglipki6j6xw7d99hmfncn0hv3yn7msxs954kk5l7dn"; + rev = "0d4a5197def6019f125444c3870aa5a8f251a2db"; + sha256 = "03shsrnagr37awsvr88pzm1yhdp680dbzzgknzxf5d9sw7c3jfsg"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5207,12 +5207,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-01-20"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "e905fb76f78fa19500ca3b9fac256b057aad535a"; - sha256 = "1vhn1mqph5yp2xxciyvlnprsawbfcy1i4cd6dvnqid38fhq1936w"; + rev = "34dd33cd283b3a89f70d32c8f55bb5ec4ce2de93"; + sha256 = "1skz0fj0v5s926mfg58nrdmivsadjzlhlymxfyz0zvkj3vkf7d50"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5531,12 +5531,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-01-21"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "3cdc23e302d6283d294f42ef5b57edb6dc9b6c5e"; - sha256 = "173w8i7blg9hxkda6qqk39zinw1v9qhq4qb9rjy39dry7g1j0z25"; + rev = "26fb0c6c5653b0bda95f29eae638305bab351123"; + sha256 = "0w9yy5c4rxw0k8z975p6zn1792lmjld1gch1m1gji0nvyyasvsbi"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -6095,12 +6095,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2023-01-18"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "edd7bab99613849c8cccddcebece47aabb9e86b8"; - sha256 = "096vjyl6wl1y027pbn81773mjzfahswk4y5aj5b6gg9vwchzyf46"; + rev = "57a52fce9b4a045f0b371a4ca5cbb535b9db0bdd"; + sha256 = "0bliv6vzgqk6nz0wk334gkbsdmkzxv38rjs0pf7jdk5azvgczslh"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -6119,12 +6119,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-01-21"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "bb5675b2daa220a8716eda2c27b23307434f1c31"; - sha256 = "0bwlr193j6wpnmivr090njmdip9a66nqh0d6wma0c368fvsj5vcg"; + rev = "85cd2ecacd8805614efe3fb3a5146ac7d0f88a17"; + sha256 = "0fhfqf4rag58q64wfrlfzyw87n3zv24gnwr9inn3i63b27r57w83"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6371,12 +6371,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-01-21"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "c9615952e71397cec4cf89a9a0db0fb9c491a5e1"; - sha256 = "19lalxdy3q77bwhmr3mrnzjw34fyikpkyqcfg1z108slnxxkvz85"; + rev = "7bef1d53302f1087a07f83a4321582d835f44d4f"; + sha256 = "1v560a216ink7km0gr32kgjxd84lcvpiwy991pvp3s0xqxmw5bx7"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6482,8 +6482,8 @@ final: prev: src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "9ca185ed23cc47bef66d97332f0694be568121e8"; - sha256 = "0wwilr4ic38x1navr8bkgv7p3fxrgjd7nyxqwla336981nrgg9y3"; + rev = "13d06d74afad093d8312fe051633b55f24049c16"; + sha256 = "07qixz6l1dyy84l14mbx6jwrmpmwdgvj8crq9vxqh44w5gwjr3qs"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -6574,12 +6574,12 @@ final: prev: oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-01-20"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "4e853eabcb002650096ef78f098253fe12ba3d8f"; - sha256 = "1w4smhf7givrpiwwl1cprvl1l6i74rl189q7frhl5ankhrlsi6l1"; + rev = "6c6b7673af1314dd7c8254a95eb8d331f6b76ac6"; + sha256 = "0gwfl7hslgbr2fawx15wbd6p4j60jnd2l68v36rxrmxl9iqm1ra6"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8262,12 +8262,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2023-01-16"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "2f32775405f6706348b71d0bb8a15a22852a61e4"; - sha256 = "166mzzwv95ab8yr4aadr6vy9fp6l64sj2kihhif5qis4k71qshkz"; + rev = "dce1156ca103b8222e4abbfc63f9c6887abf5ec6"; + sha256 = "194jkn7a4xh5733n8n1n8n9mwibvadkxj6vw44xvwd01w0db6zhx"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -8310,12 +8310,12 @@ final: prev: term-edit-nvim = buildVimPluginFrom2Nix { pname = "term-edit.nvim"; - version = "2023-01-20"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "chomosuke"; repo = "term-edit.nvim"; - rev = "28a095d6c9691039a5680b644676bbc80c6bcc35"; - sha256 = "1qlq09wxmiqqkz23id2679lj7x3rnjlyzqd67vfcp06gahnb0wky"; + rev = "eb9a18b77fa54d0416e315dc0f9793f480930419"; + sha256 = "0562rlcah3czb00m9fkc1dhhy0v9zgi5lx2hc3zjprccdhw9q41j"; }; meta.homepage = "https://github.com/chomosuke/term-edit.nvim/"; }; @@ -8767,12 +8767,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2023-01-16"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "216f15359dd3fe91415b32c62a1122dbe73175fb"; - sha256 = "0kjqw9lawqq7y12nz7wni065wb23z4rnl0wm5wbm1g991ydggc00"; + rev = "a9488d0803020e8d99ed13b95fd9def82941c978"; + sha256 = "0c78cr5f16vliiblafhcmmcq1xqybfnd70576drh6n7sr2fhss88"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -9103,12 +9103,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2023-01-19"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "31e01612f3b9eef79e6a71d4708b85505f50e255"; - sha256 = "0bvxqjhfizckshw59gkd1g3zx9qvswp0mgjdp80w7y0vsxl0m9rf"; + rev = "c7460aa8836bcb05cf32331cc751739ba9392ae7"; + sha256 = "1w2r5vwll0mfmviz7s9r6n00lr0b1fav7qmkj7zbvxh8hrf2z80b"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -9499,12 +9499,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2023-01-16"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "0d630e4aa23315c086e858c1a41ff40e082d0fe7"; - sha256 = "0w8w5w9d23hw5cfa37wnphri42yfri2f11yq4wf6aldrlkg03ral"; + rev = "5a6ff035e16c57874fbf68951b1206535733827d"; + sha256 = "1v0fxyqnbcf3x5vv5aq1z9q75m1qym6l1f9jn9iwdwg06mj581wj"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -10231,12 +10231,12 @@ final: prev: vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2022-09-17"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "c880254c0d56a9dba0bfe7bc3a5f99cd15273363"; - sha256 = "1zf2i2z2y2sdnl0yvbrhwg4j9vnz85v4ycplsqvas0kfvc2vcrka"; + rev = "baa0206f8d1685d1239d6c10f4b53869eb84c4a0"; + sha256 = "0hmdpn548bn46ygwm8w2wm609hiyn2nwj2kqc7nsi0ypa5pkbnnb"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -13861,36 +13861,36 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-01-20"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "3d0c37ceb9412202ed53da879dfb33f32ede7bcb"; - sha256 = "1ijzrwa5pkblc7j6bdgn91q58abycwdy8cmyqn7f4kcq9d4v1nvn"; + rev = "6368edcd0b5e5cb5d9fb7cdee9d62cffe3e14f0e"; + sha256 = "1d1bb9js2i58qn2b8zjhqbawlrbjk3sn91cpkjaw43wldgm3samj"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; catppuccin-vim = buildVimPluginFrom2Nix { pname = "catppuccin-vim"; - version = "2022-11-24"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "catppuccin"; repo = "vim"; - rev = "2f0affc13228f6eac363612a3cce3677fcd0b490"; - sha256 = "0702bpvmyrr5p0r3fd09szsflrvr6qnngvgdws00x4spsq03nl1p"; + rev = "cf186cffa9b3b896b03e94247ac4b56994a09e34"; + sha256 = "17di30zm743sj707z8hg95z2g7687nd1wsxyyn20xy5s3f8lnx0v"; }; meta.homepage = "https://github.com/catppuccin/vim/"; }; chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2023-01-17"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "3419e7614e69be6107b6a6f4a0c4c4bff0da33e2"; - sha256 = "0hmkd8vxb13x96hkc8n3md5rkp04iri2aq2pv44slgrh26kgvw5k"; + rev = "ed78c1968dfd3b9aa2a3444fce0482c06ee65a17"; + sha256 = "1yhffffvb5ry4vcaiz68rnjv13r63v632962axkm0wgqbc5i62fc"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -13933,12 +13933,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-01-21"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "57a29c0286bf16ea3c4f20d5938fc6680a198940"; - sha256 = "15yz5sg1lgibbmm3dk6xwvpmifwhzw107vrdk19zq2fxz5a8g5b7"; + rev = "8516da6a9c40a1d9ab81ad56c90673be29f188f7"; + sha256 = "1l3l1w75j6bal7l4jf27rvy7w5vx1w62z5650y9xgx9wjnc1y955"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; From 60d9b29eb1972752d28a410533c1e15907758ce6 Mon Sep 17 00:00:00 2001 From: "\"Zack Lalanne\"" <"zack.lalanne@gmail.com"> Date: Sun, 22 Jan 2023 14:26:13 -0600 Subject: [PATCH 102/108] vimPlugins: resolve github repository redirects --- pkgs/applications/editors/vim/plugins/generated.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6b2a8bad1a6..8dce26f130b 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4727,12 +4727,12 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-01-19"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "5b388c0de30f1605671ebfb9a20a620cda50ffce"; - sha256 = "1c01jacxp96s2xd8w2hvp46ai49lw8dsmv372l8jj6794dqm1bfv"; + rev = "d7ff61a828d59bc593ea3e2020508c114048d790"; + sha256 = "03rmdhp30kzvc98gaagxbm3cm0q1mqy28wjih6r7l14kp3qv8bv1"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; From 3ffdf2419dc1dd3e26be8360097560a33c5321ab Mon Sep 17 00:00:00 2001 From: "\"Zack Lalanne\"" <"zack.lalanne@gmail.com"> Date: Sun, 22 Jan 2023 14:27:24 -0600 Subject: [PATCH 103/108] vimPlugins.solarized-nvim: init at 2022-12-02 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 8dce26f130b..98d7a8db2f4 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -7500,6 +7500,18 @@ final: prev: meta.homepage = "https://github.com/norcalli/snippets.nvim/"; }; + solarized-nvim = buildVimPluginFrom2Nix { + pname = "solarized.nvim"; + version = "2022-12-02"; + src = fetchFromGitHub { + owner = "shaunsingh"; + repo = "solarized.nvim"; + rev = "36615f1e4d16b87def801a75132f4aab5944e9fc"; + sha256 = "1nn12zpsgiq9idsa93s04m8l2mpb2aq7f7n11cs2yhv2kbb9krlf"; + }; + meta.homepage = "https://github.com/shaunsingh/solarized.nvim/"; + }; + sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; version = "2023-01-14"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index aa02a897158..1cd0de9f124 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -630,6 +630,7 @@ https://github.com/kovisoft/slimv/,, https://github.com/gorkunov/smartpairs.vim/,, https://github.com/camspiers/snap/,, https://github.com/norcalli/snippets.nvim/,, +https://github.com/shaunsingh/solarized.nvim/,HEAD, https://github.com/sainnhe/sonokai/,, https://github.com/chikatoike/sourcemap.vim/,, https://github.com/liuchengxu/space-vim/,, From ca390ee0162b164d780a999e9d08ca5c15a766ba Mon Sep 17 00:00:00 2001 From: "\"Zack Lalanne\"" <"zack.lalanne@gmail.com"> Date: Sun, 22 Jan 2023 14:30:38 -0600 Subject: [PATCH 104/108] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 69 ++++++++++++++----- 1 file changed, 51 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index a32f0fda65a..2a1deff81a3 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -115,23 +115,23 @@ }; c_sharp = buildGrammar { language = "c_sharp"; - version = "eed2576"; + version = "a29bac0"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "eed2576ae17aae83595c4a4ce1e9c1cbf7071bb6"; - hash = "sha256-4X8X8l62bcv48Hti95MJ1GLtaeoAYi2tHy/oBt8qQVo="; + rev = "a29bac0681802139710b4d3875540901504d15cb"; + hash = "sha256-TpOaxR0Do7oGjAZ8IrbXJAP6//Kt7VxhkrWEz7yNiLY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; clojure = buildGrammar { language = "clojure"; - version = "50468d3"; + version = "262d6d6"; source = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-clojure"; - rev = "50468d3dc38884caa682800343d9a1d0fda46c9b"; - hash = "sha256-JOqkgsefFp+nvRijPsd+/01w1JsXeW5cNcZNow0ZRyY="; + rev = "262d6d60f39f0f77b3dd08da8ec895bd5a044416"; + hash = "sha256-9+tMkv329FfxYzALxkr6QZBEmJJBKUDBK4RzIsNL7S0="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-clojure"; }; @@ -349,12 +349,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "14fd388"; + version = "f0e2f78"; source = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "14fd38870c26dcae2ede1b989dc6531f1187f15e"; - hash = "sha256-TnVuHoJG3vYpjOiOQRkE+gB1aNWIaE8cbIV6x92swNk="; + rev = "f0e2f78cdadb2e67323f9ed511656e47dcaa43bb"; + hash = "sha256-aMgKNcIQUkwA3rrzS5+gHzzGESabCtbLa9HGXmIxT90="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -668,6 +668,17 @@ }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; + htmldjango = buildGrammar { + language = "htmldjango"; + version = "b2dba02"; + source = fetchFromGitHub { + owner = "interdependence"; + repo = "tree-sitter-htmldjango"; + rev = "b2dba02eddab66be669022320273d0dfe1ff923d"; + hash = "sha256-FEsvr9i0Lys8CzDlm2lhdJEAQNnmqRSFjn4I+CcZYM8="; + }; + meta.homepage = "https://github.com/interdependence/tree-sitter-htmldjango"; + }; http = buildGrammar { language = "http"; version = "2c6c445"; @@ -679,6 +690,17 @@ }; meta.homepage = "https://github.com/rest-nvim/tree-sitter-http"; }; + ini = buildGrammar { + language = "ini"; + version = "1a0ce07"; + source = fetchFromGitHub { + owner = "justinmk"; + repo = "tree-sitter-ini"; + rev = "1a0ce072ebf3afac7d5603d9a95bb7c9a6709b44"; + hash = "sha256-pPtKokpTgjoNzPW4dRkOnyzBBJFeJj3+CW3LbHSKsmU="; + }; + meta.homepage = "https://github.com/justinmk/tree-sitter-ini"; + }; java = buildGrammar { language = "java"; version = "09d650d"; @@ -1038,12 +1060,12 @@ }; php = buildGrammar { language = "php"; - version = "47dd353"; + version = "973694f"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "47dd3532df8204a444dd6eb042135f1e7964f9cb"; - hash = "sha256-YU21aRugPfwlYuj+9xJAFD44Btopnln7QEoxANIlcLs="; + rev = "973694ffcdeebca245b7ecf0d7c4cadd4f41b3c9"; + hash = "sha256-upJ8WwosOe4Xv/H9LUFVUVThLSLS+5Htr71Lyc/ZTJo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; @@ -1093,12 +1115,12 @@ }; pug = buildGrammar { language = "pug"; - version = "148608f"; + version = "26f6ac8"; source = fetchFromGitHub { owner = "zealot128"; repo = "tree-sitter-pug"; - rev = "148608f3a88708829ac4e79ff9cb1c4a618e01b7"; - hash = "sha256-wEUJdu+2deObsc54BNPdUyTAR9Eih8hGbWRrwP5bhMk="; + rev = "26f6ac805e11e19c4492089f24aa44fe71be7c1f"; + hash = "sha256-KUIjt8p4B3LrU9vRQGL9Pf3ZYMfdDrazC2kNwTpRAgg="; }; meta.homepage = "https://github.com/zealot128/tree-sitter-pug"; }; @@ -1247,12 +1269,12 @@ }; scala = buildGrammar { language = "scala"; - version = "802eba3"; + version = "067ee61"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "802eba33a1ae1ad9d873e5269dfcc9c4d86e4116"; - hash = "sha256-WZe4QjzdGAo9KWQlS66rUUxJax9pbl4p2YE/GfAmkAQ="; + rev = "067ee61ff9484eac4f5bc4d57dfd007900c48f20"; + hash = "sha256-KyxlDQla/XTBHccJG+rTqN9EO90OElZd7y21f1HTibI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -1426,6 +1448,17 @@ location = "dialects/terraform"; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; }; + thrift = buildGrammar { + language = "thrift"; + version = "999a27d"; + source = fetchFromGitHub { + owner = "duskmoon314"; + repo = "tree-sitter-thrift"; + rev = "999a27d87b8f90a74306d4e79c5e22db3ab61633"; + hash = "sha256-9aadAYFKeBv0gc4SHCYH+m77BB0c4qXpmg1mOeKp6mw="; + }; + meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift"; + }; tiger = buildGrammar { language = "tiger"; version = "a233ebe"; From 523e62005a859bf1afe72f6b9ad2aec7b8ddb2ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 22 Jan 2023 11:17:52 +0100 Subject: [PATCH 105/108] nixUnstable: bump to latest nix version --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index d8dba67d39b..73e715bddb3 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -113,5 +113,5 @@ in lib.makeExtensible (self: { stable = self.nix_2_12; - unstable = self.stable; + unstable = self.nix_2_13; }) From fcc727798cd67905ba683af6f3d007f90e7b461e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 21:41:04 +0000 Subject: [PATCH 106/108] python310Packages.google-cloud-asset: 3.16.0 -> 3.17.0 --- .../development/python-modules/google-cloud-asset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 1aaac7c96fc..de650d07ac1 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.16.0"; + version = "3.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hkuW9c5ORUuN0kbQJ2MG/GezORvqL0w51a7Ca9AdHkU="; + hash = "sha256-CsTfdEgDeHdrYWLqMt3WpYOcxT9BuQ2M8sqg0ZIwmvM="; }; propagatedBuildInputs = [ From 808663bd02143086e23418244b969ffe23f2a912 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Sun, 22 Jan 2023 23:03:45 +0100 Subject: [PATCH 107/108] nixos/uptime-kuma: add ping in path (#212001) Co-authored-by: Sandro --- nixos/modules/services/monitoring/uptime-kuma.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/uptime-kuma.nix b/nixos/modules/services/monitoring/uptime-kuma.nix index 455721b3a0e..886e14b5f6c 100644 --- a/nixos/modules/services/monitoring/uptime-kuma.nix +++ b/nixos/modules/services/monitoring/uptime-kuma.nix @@ -50,7 +50,7 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; environment = cfg.settings; - path = lib.mkIf cfg.appriseSupport (with pkgs; [ apprise ]); + path = with pkgs; [ unixtools.ping ] ++ lib.optional cfg.appriseSupport apprise; serviceConfig = { Type = "simple"; StateDirectory = "uptime-kuma"; From a67632bda0fc7562785fe5d1c2495014c436ebf7 Mon Sep 17 00:00:00 2001 From: Noah Snelson Date: Sat, 21 Jan 2023 18:26:15 -0800 Subject: [PATCH 108/108] doc/langauge-frameworks/beam: fix broken link to `elixir-ls` --- doc/languages-frameworks/beam.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 63f49adccb2..6b3a369c291 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -128,7 +128,7 @@ You will need to run the build process once to fix the hash to correspond to you ###### FOD {#fixed-output-derivation} -A fixed output derivation will download mix dependencies from the internet. To ensure reproducibility, a hash will be supplied. Note that mix is relatively reproducible. An FOD generating a different hash on each run hasn't been observed (as opposed to npm where the chances are relatively high). See [elixir_ls](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/beam-modules/elixir_ls.nix) for a usage example of FOD. +A fixed output derivation will download mix dependencies from the internet. To ensure reproducibility, a hash will be supplied. Note that mix is relatively reproducible. An FOD generating a different hash on each run hasn't been observed (as opposed to npm where the chances are relatively high). See [elixir_ls](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/beam-modules/elixir-ls/default.nix) for a usage example of FOD. Practical steps