Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
Martin Weinelt 2023-12-26 16:33:57 +01:00
commit 1bae2c7e57
24 changed files with 92 additions and 103 deletions

View File

@ -22,6 +22,7 @@ fzy,,,,,,mrcjkb
gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1,
haskell-tools.nvim,,,,,,
http,,,,0.3-0,,vcunat
image.nvim,,,,,,teto
inspect,,,,,,
jsregexp,,,,,,
ldbus,,,http://luarocks.org/dev,,,

1 name src ref server version luaversion maintainers
22 gitsigns.nvim https://github.com/lewis6991/gitsigns.nvim.git 5.1
23 haskell-tools.nvim
24 http 0.3-0 vcunat
25 image.nvim teto
26 inspect
27 jsregexp
28 ldbus http://luarocks.org/dev

View File

@ -2,7 +2,7 @@
let
pname = "joplin-desktop";
version = "2.12.18";
version = "2.13.9";
inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}";
@ -16,9 +16,9 @@ let
src = fetchurl {
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}";
sha256 = {
x86_64-linux = "1fwcqgqni7d9x0prdy3p8ccc5lzgn57rhph4498vs1q40kyq8823";
x86_64-darwin = "sha256-atd7nkefLvilTq39nTLbXQhm1zzBCHOLL7MRJwlTSMk=";
aarch64-darwin = "sha256-xiWXD+ULSVJ80uruYz0uRFkDRT1QOUd6FSWDKK9yLMc=";
x86_64-linux = "sha256-1po4i+SG5o28uBtgmIXxnCP8/ZvFgTXxrdKVTSA7ndE=";
x86_64-darwin = "sha256-4NeFVj+RB3CyCQxrMM7ZfFahBMa0WumY1YPslJ2votc=";
aarch64-darwin = "sha256-pxlato6AQYduTCXouGVNSGr5awhGwlC8jTkG9nB2U+4=";
}.${system} or throwSystem;
};

View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "arkade";
version = "0.10.17";
version = "0.10.20";
src = fetchFromGitHub {
owner = "alexellis";
repo = "arkade";
rev = version;
hash = "sha256-Ubj2jrQFmMTSY2+Z4pqDIQ+K8JycX+NOpgcuyCrD4uo=";
hash = "sha256-aOJ07Ks+J7cDvF3InKGYx4dJAql9ltJQqa8P+4cKhNk=";
};
CGO_ENABLED = 0;

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cilium-cli";
version = "0.15.17";
version = "0.15.19";
src = fetchFromGitHub {
owner = "cilium";
repo = pname;
rev = "v${version}";
hash = "sha256-Gb3S3R9gt/4sCOxjiIEXDnVEUEt7Zgz0GJZFEP9D+h8=";
hash = "sha256-52i3Ek/rXFF9rMMiXNMnRjT2HYsknGKvVtCRrVDmo9U=";
};
vendorHash = null;

View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "glooctl";
version = "1.15.17";
version = "1.15.18";
src = fetchFromGitHub {
owner = "solo-io";
repo = "gloo";
rev = "v${version}";
hash = "sha256-tTsiDlpjQ86CAMzyZhRKPYrEqFm8sCPoeCRzTrmfyx4=";
hash = "sha256-oHwo0I3OFfilLg2tlL0EycTo6BC7LYbzg7dxgfz/XeI=";
};
vendorHash = "sha256-/JliAQtUd8fbKThqkwC4u4XNawXhoZaV1XdJRciJxmw=";
vendorHash = "sha256-MrTiZCvYUmdX4sK85jeeQpUupvitH6PfbQ+RfwELaV4=";
subPackages = [ "projects/gloo/cli/cmd" ];

View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "helmfile";
version = "0.159.0";
version = "0.160.0";
src = fetchFromGitHub {
owner = "helmfile";
repo = "helmfile";
rev = "v${version}";
sha256 = "sha256-7RFDa8Yw2tPjVvJLVPb7VbDNhrHNxzqmE0uogm7X/HY=";
sha256 = "sha256-sPHEYhKiKzB5MYylWeHKpVjjXbDsWbg99TKqT/d3uJ0=";
};
vendorHash = "sha256-kVr6h5u71RimRER6tNxZUewSqqjaAPptriD5bfsE85U=";
vendorHash = "sha256-LkmPytmXrense/M0erBkxeQ7XXGlHDLY1yedsOxk4+E=";
doCheck = false;

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubecm";
version = "0.25.0";
version = "0.26.0";
src = fetchFromGitHub {
owner = "sunny0826";
repo = "kubecm";
rev = "v${version}";
hash = "sha256-8Y8JChZxjbN/nOw2tzDfJvYSMAtAadf6QMsDFK4IIOg=";
hash = "sha256-53diz+TNGRmNbSZJAIKPFi0x/BdL02Tjb847I/XdhW0=";
};
vendorHash = "sha256-HjMgXEDX9pDpK+1Hm0xI0wYRfpj7K6xkZJXCUBqbE3Y=";
vendorHash = "sha256-QPd7gUEY6qNdl96slKvY7+Av6fCU9q+XdjKNKUXz2Wo=";
ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"];
doCheck = false;

View File

@ -1,14 +1,14 @@
{ lib, go, buildGoModule, fetchFromGitHub, installShellFiles }:
{ lib, go, buildGoModule, fetchFromGitHub, installShellFiles, testers, vcluster }:
buildGoModule rec {
pname = "vcluster";
version = "0.17.0";
version = "0.18.1";
src = fetchFromGitHub {
owner = "loft-sh";
repo = pname;
rev = "v${version}";
hash = "sha256-xmSp3cNqNv48gBWpt0Pnvl3l5gIyV1oPNGrB58X+OVU=";
hash = "sha256-TJjMB7x8MOlr3GexsnOZBFPJovVkf4ByRn1aGprvZFQ=";
};
vendorHash = null;
@ -36,9 +36,15 @@ buildGoModule rec {
postInstall = ''
installShellCompletion --cmd vcluster \
--bash <($out/bin/vcluster completion bash) \
--fish <($out/bin/vcluster completion fish) \
--zsh <($out/bin/vcluster completion zsh)
'';
passthru.tests.version = testers.testVersion {
package = vcluster;
command = "vcluster --version";
};
meta = with lib; {
description = "Create fully functional virtual Kubernetes clusters";
downloadPage = "https://github.com/loft-sh/vcluster";

View File

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "netmaker";
version = "0.21.1";
version = "0.21.2";
src = fetchFromGitHub {
owner = "gravitl";
repo = pname;
rev = "v${version}";
hash = "sha256-LfvO95jqzJzB44JxzB00GubTKJkvK/NR42eGYipirbM=";
hash = "sha256-0KyBRIMXGqg4MdTyN3Kw1rVbZ7ULlfW6M9DSfAUQF8A=";
};
vendorHash = "sha256-BRgzPH7uiUHcouEw0KNpM5k0/kZMImvI9MFn4ahXIRM=";
vendorHash = "sha256-B9r+p9kL/8h5qGmJ2WChnU3qKFf9z76YFqn6M2dXsDg=";
inherit subPackages;

View File

@ -10,7 +10,7 @@
}:
let
version = "5.12.180";
version = "5.12.181";
in
rustPlatform.buildRustPackage {
pname = "git-mit";
@ -20,10 +20,10 @@ rustPlatform.buildRustPackage {
owner = "PurpleBooth";
repo = "git-mit";
rev = "v${version}";
hash = "sha256-12ZMyKIar5ck4jr7PCmyrnGWd6iv9cCwvTGSLbOCl4o=";
hash = "sha256-XXVLYKicFcYNx33eElqlZcDNZgq4FnbwvYSshZwwHls=";
};
cargoHash = "sha256-n2wsOJrQvMKI1mNYGxntz8hZt5adL3obSdIo4DqF1Fs=";
cargoHash = "sha256-PskRV+LfHjHK0WTwb9Lt2E2R9g+lyyEY7A1vvFLhPdw=";
nativeBuildInputs = [ pkg-config ];

View File

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-swift";
version = "0.4.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "antoniusnaumann";
repo = "cargo-swift";
rev = "v${version}";
hash = "sha256-dW0/h7uS0BEstiochACIySSKXsz+E6Tj5MaLtdin7gw=";
hash = "sha256-v7ZZ3tMM8KmRk6y3uSw8ZBEcByQ95XQv3XPTUtDGUQ0=";
};
cargoHash = "sha256-LsjDeKfAvgVYM4qYyWq9MoXB4jIh870urrFHpiGCGPc=";
cargoHash = "sha256-K3xZytJJ9/CaHWHL1fX0vKYpzH9yz3xOs2J5PoZWWv0=";
meta = with lib; {
description = "A cargo plugin to easily build Swift packages from Rust code";

View File

@ -645,6 +645,30 @@ buildLuarocksPackage {
};
}) {};
image-nvim = callPackage(
{ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, magick }:
buildLuarocksPackage {
pname = "image.nvim";
version = "1.2.0-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/image.nvim-1.2.0-1.rockspec";
sha256 = "0732fk2p2v9f72689jms4pdjsx9m7vdi1ib65jfz7q4lv9pdx508";
}).outPath;
src = fetchzip {
url = "https://github.com/3rd/image.nvim/archive/v1.2.0.zip";
sha256 = "1v4db60yykjajabmf12zjcg47bb814scjrig0wvn4yc11isinymg";
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua magick ];
meta = {
homepage = "https://github.com/3rd/image.nvim";
description = "🖼 Bringing images to Neovim.";
license.fullName = "MIT";
};
}) {};
inspect = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }:
buildLuarocksPackage {
pname = "inspect";

View File

@ -19,8 +19,8 @@
buildPythonPackage rec {
pname = "python-roborock";
version = "0.36.2";
format = "pyproject";
version = "0.38.0";
pyproject = true;
disabled = pythonOlder "3.10";
@ -28,12 +28,12 @@ buildPythonPackage rec {
owner = "humbertogontijo";
repo = "python-roborock";
rev = "refs/tags/v${version}";
hash = "sha256-FyoYAXWdNANxZJ9EKyfRrywKPJmSyt8QRPBlrk9jRIw=";
hash = "sha256-jYESUMhLb5oiM3PWIIIU4dn/waGUnCAaXe0URnIq0C8=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "poetry-core==1.7.0" "poetry-core"
--replace "poetry-core==1.7.1" "poetry-core"
'';
pythonRelaxDeps = [

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pyvicare";
version = "2.29.0";
version = "2.30.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "somm15";
repo = "PyViCare";
rev = "refs/tags/${version}";
hash = "sha256-FTvlRCPajRqKLCb5x1Gz/EGZIdMhXow4nP+WlWbjLko=";
hash = "sha256-jcnA5qxS4eq1nZ0uo8NGPoSGTI/JrrH02MJPFxL3hQM=";
};
postPatch = ''

View File

@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "types-s3transfer";
version = "0.8.2";
version = "0.10.0";
pyproject = true;
src = fetchPypi {
pname = "types_s3transfer";
inherit version;
hash = "sha256-LkF1b8+Ud1qZSa+oVkiaxFcDCGCbBJPfvXtNMz60I+Y=";
hash = "sha256-NeSZjCXff4mFrWne3I5IYOivO0O3YV6UDVPADUE73Gk=";
};
nativeBuildInputs = [

View File

@ -16,9 +16,9 @@
buildPythonPackage rec {
pname = "xhtml2pdf";
version = "0.2.13";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = pname;
@ -42,8 +42,15 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTests = [
# Tests requires network access
"test_document_cannot_identify_image"
"test_document_with_broken_image"
];
pythonImportsCheck = [
"xhtml2pdf"
"xhtml2pdf.pisa"
];
meta = with lib; {
@ -52,5 +59,6 @@ buildPythonPackage rec {
changelog = "https://github.com/xhtml2pdf/xhtml2pdf/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ ];
mainProgram = "xhtml2pdf";
};
}

View File

@ -1,26 +0,0 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "dep";
version = "0.5.4";
rev = "v${version}";
goPackagePath = "github.com/golang/dep";
subPackages = [ "cmd/dep" ];
src = fetchFromGitHub {
inherit rev;
owner = "golang";
repo = "dep";
sha256 = "02akzbjar1v01rdal746vk6mklff29yk2mqfyjk1zrs0mlg38ygd";
};
ldflags = [ "-s" "-w" "-X main.commitHash=${rev}" "-X main.version=${version}" ];
meta = with lib; {
homepage = "https://github.com/golang/dep";
description = "Go dependency management tool";
license = licenses.bsd3;
maintainers = with maintainers; [ carlsverre rvolosatovs ];
};
}

View File

@ -5,13 +5,13 @@
}:
buildGoModule rec {
pname = "devbox";
version = "0.8.4";
version = "0.8.5";
src = fetchFromGitHub {
owner = "jetpack-io";
repo = pname;
rev = version;
hash = "sha256-B+7c27xq+JNhP6s9mS5t7AURPV9/HFf5o1jtqyH4x2g=";
hash = "sha256-Vgke4CTVU5KW7iDyzk6P1ab5nOyICblvJtUQTISc2jg=";
};
ldflags = [
@ -23,7 +23,7 @@ buildGoModule rec {
# integration tests want file system access
doCheck = false;
vendorHash = "sha256-4HdBTOTQGMAez5gg1R7+M3EqrP0cv8iNjD7ayZD95aU=";
vendorHash = "sha256-rP3vktCfmUeZhc0DaU2osVryNabsnaWWyfFYFy7W1pc=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -8,16 +8,16 @@
buildNpmPackage rec {
pname = "firebase-tools";
version = "12.4.8";
version = "13.0.2";
src = fetchFromGitHub {
owner = "firebase";
repo = "firebase-tools";
rev = "v${version}";
hash = "sha256-uyw3M6EWRaiDLZg1MH1weiXih5hWh5Kz3HnB1xXISNA=";
hash = "sha256-vR4WvnZjxdbebXWdVbM8vQTCo7pgRMcu9A2KygHZCMk=";
};
npmDepsHash = "sha256-AjUREpqQX9+7tjO68Q9WIWQ71l5O641Oc+3Pr2khP4s=";
npmDepsHash = "sha256-h99Zj+yJJvLKc/B6AbKKQTOdrZCIT3BVlkxrOtOyNA4=";
postPatch = ''
ln -s npm-shrinkwrap.json package-lock.json

View File

@ -1,22 +0,0 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "govendor";
version = "1.0.9";
goPackagePath = "github.com/kardianos/govendor";
src = fetchFromGitHub {
owner = "kardianos";
repo = "govendor";
rev = "v${version}";
sha256 = "0g02cd25chyijg0rzab4xr627pkvk5k33mscd6r0gf1v5xvadcfq";
};
meta = with lib; {
homepage = "https://github.com/kardianos/govendor";
description = "Go vendor tool that works with the standard vendor file";
license = licenses.bsd3;
maintainers = with maintainers; [ zimbatm ];
};
}

View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "hcloud";
version = "1.41.0";
version = "1.41.1";
src = fetchFromGitHub {
owner = "hetznercloud";
repo = "cli";
rev = "refs/tags/v${version}";
hash = "sha256-NcEJgC3FtGgv0m7qisCB8vaHvD5Yw/UIHsOFBYiID4c=";
hash = "sha256-ZC71++aC0fUkUG0h5aRxU0FpR1eNruFWAB1e2e5c/Vo=";
};
vendorHash = "sha256-qAgKotc+ypm0pHcbKCgpFmTY5W1b8Oq3XrrP6RVulig=";
vendorHash = "sha256-T407Y4IZlJnrCGSWpuN1wv8Dng2F7++2cMfLGjYC2vM=";
ldflags = [
"-s"

View File

@ -7,13 +7,13 @@
rustPlatform.buildRustPackage rec {
pname = "dua";
version = "2.23.0";
version = "2.24.1";
src = fetchFromGitHub {
owner = "Byron";
repo = "dua-cli";
rev = "v${version}";
hash = "sha256-dHtPz5TxNQyBHOuCYH1XRIeR63ghMP/moaULI++tg8Y=";
hash = "sha256-CezZ0Nse1s1jSwPoaY5Gvpfg3ztM5e8OjvW+WsMMrDM=";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
postFetch = ''
@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
'';
};
cargoHash = "sha256-10etmf0eQw9nD74dJMpQGAV4cK9FnTWKSrhBT3ZJblc=";
cargoHash = "sha256-oDDQPN2bLHJFMmdKoB+0qbcVOMVnamF23Phzq7eLFJ4=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Foundation

View File

@ -193,6 +193,7 @@ mapAliases ({
deltachat-electron = deltachat-desktop; # added 2021-07-18
demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18
dep = throw "'dep' has been removed, because it is deprecated and archived in favor of Go modules"; # Added 2023-12-26
devserver = throw "'devserver' has been removed in favor of 'miniserve' or other alternatives"; # Added 2023-01-13
dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04
dnnl = oneDNN; # Added 2020-04-22
@ -343,6 +344,7 @@ mapAliases ({
google-chrome-dev = throw "'google-chrome-dev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18
google-gflags = throw "'google-gflags' has been renamed to/replaced by 'gflags'"; # Converted to throw 2023-09-10
go-thumbnailer = thud; # Added 2023-09-21
govendor = throw "'govendor' has been removed as it is no longer maintained upstream, please use Go modules instead"; # Added 2023-12-26
gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10
graalvm11-ce = throw "graalvm11-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26

View File

@ -28423,8 +28423,6 @@ with pkgs;
delve = callPackage ../development/tools/delve { };
dep = callPackage ../development/tools/dep { };
dep2nix = callPackage ../development/tools/dep2nix { };
easyjson = callPackage ../development/tools/easyjson { };
@ -28497,8 +28495,6 @@ with pkgs;
govers = callPackage ../development/tools/govers { };
govendor = callPackage ../development/tools/govendor { };
goverview = callPackage ../tools/security/goverview { };
go-tools = callPackage ../development/tools/go-tools { };