Skip to content

Commit ce5d58b

Browse files
Merge master into staging-next
2 parents 83fd733 + f57e1a4 commit ce5d58b

23 files changed

Lines changed: 289 additions & 56 deletions

File tree

pkgs/applications/networking/cluster/terraform-providers/providers.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -851,11 +851,11 @@
851851
"vendorHash": "sha256-HzBj7TSjiv/Ov10KOt5V4oQaKK7CKjBjxpSrhmOl1lQ="
852852
},
853853
"loafoe_htpasswd": {
854-
"hash": "sha256-1o2kgeTFxegzOgGXWP4OYZ3uC3WbAkCXPqScMvVpHr0=",
854+
"hash": "sha256-1HCvAGWsYlcYCA8iOmBb/AawxHPLuoxxQWLzNy0x79M=",
855855
"homepage": "https://registry.terraform.io/providers/loafoe/htpasswd",
856856
"owner": "loafoe",
857857
"repo": "terraform-provider-htpasswd",
858-
"rev": "v2.0.0",
858+
"rev": "v2.1.0",
859859
"spdx": "MIT",
860860
"vendorHash": "sha256-1gzJdcSvFPE8Spkwxe24U7DUyrz4qpDoFVHm6vCWF6A="
861861
},

pkgs/applications/video/kodi/addons/trakt/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
buildKodiAddon rec {
1111
pname = "trakt";
1212
namespace = "script.trakt";
13-
version = "3.6.1";
13+
version = "3.8.2";
1414

1515
src = fetchzip {
1616
url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip";
17-
sha256 = "sha256-ZlBucYYRA1cL5c0H1jhXeKE1itReZe2gAJYFFxuUebo=";
17+
sha256 = "sha256-75neHPVWpHhzMIOfNFvvX/Xqy3n1DO3SGg16zv/r9dU=";
1818
};
1919

2020
propagatedBuildInputs = [

pkgs/by-name/au/audiobookshelf/package.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515

1616
let
1717
source = {
18-
version = "2.33.0";
19-
hash = "sha256-jHwSJm1VB0W3/sIas39wgvcn+K62DyKJqMdO0kbSgeY=";
20-
npmDepsHash = "sha256-PvtnkQytGkKS2MYwpwAGd5F2CrsVKJ2lLbS46ta5a5c=";
21-
clientNpmDepsHash = "sha256-+ivzzGLWPCnXWJt6Z6jzXkzMjzXWUK4iRfmF+gUSKEo=";
18+
version = "2.33.1";
19+
hash = "sha256-O1AurSUq3MNcSchQlC/UfPO2KoB4dBBsONAQ2Bmxk9o=";
20+
npmDepsHash = "sha256-NVHKPiT4GFiFVVyO7z/fZtU8Zf4o/LM1PmUs6zwzZF0=";
21+
clientNpmDepsHash = "sha256-KWGnFeXxOVGqAruB9k/FqQfQNG6JrZFUQpo0Ls8jEYA=";
2222
};
2323

2424
src = fetchFromGitHub {

pkgs/by-name/au/autotier/package.nix

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ stdenv.mkDerivation (finalAttrs: {
4141
})
4242
];
4343

44+
postPatch = ''
45+
# Fix build with boost 1.89+ where boost_system stub library has been removed
46+
substituteInPlace makefile --replace-fail "-lboost_system" ""
47+
'';
48+
4449
# Required by rocksdb after 10.7.5
4550
env.EXTRA_CFLAGS = "-std=c++20 -fno-char8_t";
4651

pkgs/by-name/cv/cvc5/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818

1919
stdenv.mkDerivation (finalAttrs: {
2020
pname = "cvc5";
21-
version = "1.3.2";
21+
version = "1.3.3";
2222

2323
src = fetchFromGitHub {
2424
owner = "cvc5";
2525
repo = "cvc5";
2626
tag = "cvc5-${finalAttrs.version}";
27-
hash = "sha256-Um1x+XgQ5yWSoqtx1ZWbVAnNET2C4GVasIbn0eNfico=";
27+
hash = "sha256-tXhOMrf/sZwEZFWB2Amp9lApWEsfuPqaj9H7RmI733o=";
2828
};
2929

3030
__structuredAttrs = true;

pkgs/by-name/cw/cwal/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111

1212
stdenv.mkDerivation (finalAttrs: {
1313
pname = "cwal";
14-
version = "0.5.0";
14+
version = "0.7.0";
1515

1616
src = fetchFromGitHub {
1717
owner = "nitinbhat972";
1818
repo = "cwal";
1919
rev = "v${finalAttrs.version}";
20-
hash = "sha256-ky7ng6yxa8aMKRjjSHzWU6UC4QfeOdS+/rQ3eA/wRPE=";
20+
hash = "sha256-2COw5YBa16XzB4h5dfTLDF6LYjb10UC3+hCgTavnnVo=";
2121
};
2222

2323
strictDeps = true;

pkgs/by-name/de/delta/package.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313

1414
rustPlatform.buildRustPackage (finalAttrs: {
1515
pname = "delta";
16-
version = "0.18.2";
16+
version = "0.19.0";
1717

1818
src = fetchFromGitHub {
1919
owner = "dandavison";
2020
repo = "delta";
2121
tag = finalAttrs.version;
22-
hash = "sha256-fJSKGa935kwLG8WYmT9Ncg2ozpSNMzUJx0WLo1gtVAA=";
22+
hash = "sha256-hVHxzunST35lJXBhSN5eIJfJV+yeRfrYGv2iORUv6W8=";
2323
};
2424

25-
cargoHash = "sha256-qF55A1CENoHu3LBtNRc/n2PKYxMls7pdn2d56Mp18Qs=";
25+
cargoHash = "sha256-DGkYtvxhRdKFHUvES0jdynOcWjDX7VEQdNzZ5az0JY0=";
2626

2727
nativeBuildInputs = [
2828
installShellFiles
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
lib,
3+
rustPlatform,
4+
fetchFromGitHub,
5+
versionCheckHook,
6+
nix-update-script,
7+
}:
8+
9+
rustPlatform.buildRustPackage (finalAttrs: {
10+
pname = "dn42-registry-wizard";
11+
version = "0.4.17";
12+
13+
src = fetchFromGitHub {
14+
owner = "Kioubit";
15+
repo = "dn42_registry_wizard";
16+
tag = "v${finalAttrs.version}";
17+
hash = "sha256-wczsDKHcf/izEhJp9THL9yoEfZHTZ0FoVU4CTxmNuAY=";
18+
};
19+
20+
cargoHash = "sha256-Op0xjblw3fB1boRaYoVH9O+c2Zodi/TtJ6sQSiz/rLo=";
21+
22+
postInstall = ''
23+
mv $out/bin/{registry_wizard,dn42-registry-wizard}
24+
'';
25+
26+
nativeInstallCheckInputs = [ versionCheckHook ];
27+
doInstallCheck = true;
28+
29+
passthru.updateScript = nix-update-script { };
30+
31+
meta = {
32+
description = "Collection of tools to interact with DN42 registry data";
33+
homepage = "https://github.com/Kioubit/dn42_registry_wizard";
34+
license = lib.licenses.gpl3Only;
35+
maintainers = with lib.maintainers; [ defelo ];
36+
mainProgram = "dn42-registry-wizard";
37+
};
38+
})

pkgs/by-name/is/isabelle/package.nix

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
vampire,
1414
eprover-ho,
1515
cvc5,
16+
libpoly,
1617
csdp,
1718
rlwrap,
1819
perl,
@@ -102,15 +103,22 @@ let
102103
'';
103104
};
104105

105-
cvc5' = cvc5.overrideAttrs {
106-
version = "1.2.0";
107-
src = fetchFromGitHub {
108-
owner = "cvc5";
109-
repo = "cvc5";
110-
tag = "cvc5-1.2.0";
111-
hash = "sha256-Um1x+XgQ5yWSoqtx1ZWbVAnNET2C4GVasIbn0eNfico=";
112-
};
113-
};
106+
cvc5' =
107+
(cvc5.override {
108+
libpoly = libpoly.overrideAttrs {
109+
version = "0.2.0";
110+
__intentionallyOverridingVersion = true;
111+
};
112+
}).overrideAttrs
113+
{
114+
version = "1.2.0";
115+
src = fetchFromGitHub {
116+
owner = "cvc5";
117+
repo = "cvc5";
118+
tag = "cvc5-1.2.0";
119+
hash = "sha256-Um1x+XgQ5yWSoqtx1ZWbVAnNET2C4GVasIbn0eNfico=";
120+
};
121+
};
114122

115123
in
116124
stdenv.mkDerivation (finalAttrs: {

pkgs/by-name/ku/kubectl-gadget/package.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66

77
buildGoModule (finalAttrs: {
88
pname = "kubectl-gadget";
9-
version = "0.49.1";
9+
version = "0.50.1";
1010

1111
src = fetchFromGitHub {
1212
owner = "inspektor-gadget";
1313
repo = "inspektor-gadget";
1414
tag = "v${finalAttrs.version}";
15-
hash = "sha256-YWH/iW5jVxxKkrlqXIAq30wdrxpLLqZ9Lv6oAWTpZSg=";
15+
hash = "sha256-o8Ckpa1UCit8/FTeXwWjRzvOGtRvp4BqL0K6829P7AY=";
1616
};
1717

18-
vendorHash = "sha256-IIRSEqE+cXpQGt3Z9U7fhSuspj5y2l4aRdjY5HnQCbU=";
18+
vendorHash = "sha256-UzttScIgwy5pN1bDr6vfYn8V6ipaIp0Cw1xIgCmJIbY=";
1919

2020
env.CGO_ENABLED = 0;
2121

0 commit comments

Comments
 (0)