Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-07-18 06:01:08 +00:00 committed by GitHub
commit eebfb7a54e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 285 additions and 126 deletions

View file

@ -18414,6 +18414,13 @@
githubId = 1108325;
name = "Théo Zimmermann";
};
zmitchell = {
name = "Zach Mitchell";
email = "zmitchell@fastmail.com";
matrix = "@zmitchell:matrix.org";
github = "zmitchell";
githubId = 10246891;
};
zoedsoupe = {
github = "zoedsoupe";
githubId = 44469426;

View file

@ -121,7 +121,7 @@ in {
The available configuration options can be found in
[the environment template file](https://github.com/dani-garcia/vaultwarden/blob/${vaultwarden.version}/.env.template).
See ()[#opt-services.vaultwarden.environmentFile) for how
See [](#opt-services.vaultwarden.environmentFile) for how
to set up access to the Admin UI to invite initial users.
'';
};

View file

@ -2,7 +2,7 @@
let
pname = "erigon";
version = "2.48.0";
version = "2.48.1";
in
buildGoModule {
inherit pname version;
@ -11,11 +11,11 @@ buildGoModule {
owner = "ledgerwatch";
repo = pname;
rev = "v${version}";
hash = "sha256-L2uQJdC0Z5biv//QzgjPpygsk8GlUoQsSNH4Cp5TvhU=";
hash = "sha256-ApVsrK1Di6d3WBj/VIUcYJBceFDTeNfsXYPRfbytvZg=";
fetchSubmodules = true;
};
vendorHash = "sha256-wzA75+BL5Fm6X13dF/ou7qvMEdeaImmSs2lypH4hOTY=";
vendorHash = "sha256-bsPeEAhvuT5GIpYMoyPyh0BHMDKyKjBiVnYLjtF4Mkc=";
proxyVendor = true;
# Build errors in mdbx when format hardening is enabled:

View file

@ -23,13 +23,13 @@
let
pname = "pulsar";
version = "1.106.0";
version = "1.107.1";
sourcesPath = {
x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz";
x86_64-linux.hash = "sha256-Wd0z6kHd6qZgrgZBxZQjwVC1dDqYtJ94L7aAnbuJoO8=";
x86_64-linux.hash = "sha256-stY/sutbFVWQuN6C/tkT/G5MMVypgm3Um78jk8RHF6k=";
aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz";
aarch64-linux.hash = "sha256-Xadjqw8PRrq0ksif6te0gxn8xeYTCYnJcsrezfl2SYs=";
aarch64-linux.hash = "sha256-umL60+FJKT8ThnzxgzzVzsY0nhJwsNF4YvrKoruxz7U=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
additionalLibs = lib.makeLibraryPath [

View file

@ -2,6 +2,7 @@
, stdenv
, fetchFromGitHub
, qtsvg
, qtwayland
, qttools
, exiv2
, wrapQtAppsHook
@ -27,6 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = [
qtsvg
qtwayland
exiv2
];

View file

@ -0,0 +1,27 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule {
pname = "confetty";
version = "unstable-2022-11-05";
src = fetchFromGitHub {
owner = "maaslalani";
repo = "confetty";
rev = "6c6f1b5b605f78c3ed3bab2d2a1357c0dd794221";
hash = "sha256-1BAszv9I2JDflWyHuAlbJo7+oI7BI/TL10uFIYa8mLk=";
};
vendorHash = "sha256-RymdnueY674Zd231O8CIw/TEIDaWDzc+AaI6yk9hFgc=";
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "Confetti in your TTY";
homepage = "https://github.com/maaslalani/confetty";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}

View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "thedesk";
version = "24.1.2";
version = "24.1.3";
src = fetchurl {
url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb";
sha256 = "sha256-0EvJ60yTRi3R0glgI8l3r7mxR76McDA1x5aF6WQDbdU=";
sha256 = "sha256-Fq+kDdNR7G0Fbi++OFGxYbgFFOnpdzxy0JVh5t/i8hs=";
};
nativeBuildInputs = [

View file

@ -0,0 +1,27 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule {
pname = "typer";
version = "unstable-2023-02-08";
src = fetchFromGitHub {
owner = "maaslalani";
repo = "typer";
rev = "02aa80b3be8a6c2c9d08d9a56b3fe784adf00933";
hash = "sha256-J3wTqWxHEQz1AAt7DfUmpgc7wmfILBtyHuDrmqN96fI=";
};
vendorHash = "sha256-t4zim6WhqGAf1zHmmbJbpVvQcE/aoNL7ZLdjU7f3rp8=";
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "Typing test in your terminal";
homepage = "https://github.com/maaslalani/typer";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}

View file

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "bosh-cli";
version = "7.3.0";
version = "7.3.1";
src = fetchFromGitHub {
owner = "cloudfoundry";
repo = pname;
rev = "v${version}";
sha256 = "sha256-o/JhfS2VkN5qzZglFN1YNSZV2A2LowNouQee4Tv2dFc=";
sha256 = "sha256-bCZuX4c/ltnq1se/tbqQmWBc7/6IRUWqSNg7T3pFl3k=";
};
vendorHash = null;

View file

@ -300,11 +300,11 @@
"vendorHash": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ="
},
"digitalocean": {
"hash": "sha256-XKNQdsbh8+iq1N+pwlByFwdm6IlfEsgnT3q/l8SiHvU=",
"hash": "sha256-CnakqGO/adv44knzp3Q5nC17tD+ZpOEFqfQXPk20klg=",
"homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
"owner": "digitalocean",
"repo": "terraform-provider-digitalocean",
"rev": "v2.28.1",
"rev": "v2.29.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -436,31 +436,31 @@
"vendorHash": null
},
"gitlab": {
"hash": "sha256-SHc1Mz1JsmNqTjfuJ4Ncll7fh5ruoRXNUAQRfFlibog=",
"hash": "sha256-3Ph+Z4RI4K+OLc7c7f3JQH4UYRRVV6dM6R0TgkJf+yQ=",
"homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab",
"owner": "gitlabhq",
"repo": "terraform-provider-gitlab",
"rev": "v16.1.0",
"rev": "v16.1.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-XgGNz+yP+spRA2+qFxwiZFcBRv2GQWhiYY9zoC8rZPc="
},
"google": {
"hash": "sha256-FlBTLc3QUsPAO1OIr8aOlb7ppePsAjtKKrBOTS+JYFI=",
"hash": "sha256-yRI5dJbJNjaMPKWKNWH+/oq7vkVt8NI8jfO8Z5QrcTE=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.73.1",
"rev": "v4.73.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-X+7UZM0iZzG7LvaK6nKXF3taKIiJfhWRmY1q1Uz9M4A="
},
"google-beta": {
"hash": "sha256-GYX0tmNut04NbpqbfXCy/5Rabn3leWf1VH+yGHTsCek=",
"hash": "sha256-GE7Y07w9wQ7HHGSxoWV23skAEU444cSTHLD+g1XS/Ow=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.73.1",
"rev": "v4.73.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-X+7UZM0iZzG7LvaK6nKXF3taKIiJfhWRmY1q1Uz9M4A="
},
@ -483,11 +483,11 @@
"vendorHash": "sha256-gY15FJb1svy2AxXs6ZOmZX5o3oXIokzf5hXlFlx1cXU="
},
"gridscale": {
"hash": "sha256-u0NX1hoawEVbmj2Id6qvb8GYgH/u3cbgWZ/b+2nBYNM=",
"hash": "sha256-Xs3eWLwsHFTvuH0rUroB6lkzusjUiH3ajt6ila9v/9M=",
"homepage": "https://registry.terraform.io/providers/gridscale/gridscale",
"owner": "gridscale",
"repo": "terraform-provider-gridscale",
"rev": "v1.21.0",
"rev": "v1.21.1",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -1016,13 +1016,13 @@
"vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
},
"signalfx": {
"hash": "sha256-mG3JUf7OASLvsfD7jk1p4CQRfrDj/TNnUKD1SzHQqEA=",
"hash": "sha256-ez9mmgzurLPBya6eJW2iWNtiTt8yg63Yavf6xiplZ9w=",
"homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
"owner": "splunk-terraform",
"repo": "terraform-provider-signalfx",
"rev": "v7.0.0",
"rev": "v8.0.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-JE6gg32TmpEHxskJjFaqeg0tfR463fUUnwKzc0O08eo="
"vendorHash": "sha256-PQU4VC5wHcB70UkZaRT8jtz+qOAONU2SxtRrTmml9vY="
},
"skytap": {
"hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=",
@ -1052,13 +1052,13 @@
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
},
"spotinst": {
"hash": "sha256-YX0NTJ8T+HVrSiRC0WkA+SVakQ+ggVx/7JYvf3SkmPM=",
"hash": "sha256-fnWSDapAJXnNG1DHribLcRpMgGHke5EhmuQQjaj6sWE=",
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
"owner": "spotinst",
"repo": "terraform-provider-spotinst",
"rev": "v1.125.1",
"rev": "v1.126.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-cT/85DbG5U/JPA+rgJ2BhxJA90KBKjg+X+glREiezAg="
"vendorHash": "sha256-2SUCMdZRkAU97HFKEAKe5ryB+NB55aR/5k5K3p/digI="
},
"stackpath": {
"hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=",

View file

@ -2,13 +2,13 @@
(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools";
version = "20230707";
version = "20230716";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
hash = "sha256-kVXkcAhDpwc6/d5iXMJ3Z31p9REqWUvSimE8p+OD8aU=";
hash = "sha256-k2QY+7mEXqvDzO0xv3XxQdhDje4iCPVOUybWnONLMTM=";
};
postPatch = ''

View file

@ -0,0 +1,11 @@
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1535,7 +1535,7 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
[[package]]
name = "tiny"
-version = "0.10.0"
+version = "0.11.0"
dependencies = [
"clap",
"dirs",

View file

@ -12,16 +12,18 @@
rustPlatform.buildRustPackage rec {
pname = "tiny";
version = "0.10.0";
version = "0.11.0";
src = fetchFromGitHub {
owner = "osa1";
repo = pname;
rev = "v${version}";
sha256 = "177d1x4z0mh0p7c5ldq70cn1j3pac50d8cil2ni50hl49c3x6yy1";
hash = "sha256-oOaLQh9gJlurHi9awoRh4wQnXwkuOGJLnGQA6di6k1Q=";
};
cargoSha256 = "05q3f1wp48mwkz8n0102rwb6jzrgpx3dlbxzf3zcw8r1mblgzim1";
cargoPatches = [ ./Cargo.lock.patch ];
cargoHash = "sha256-wUBScLNRNAdDZ+HpQjYiExgPJnE9cxviooHePbJI13Q=";
nativeBuildInputs = lib.optional stdenv.isLinux pkg-config;
buildInputs = lib.optionals dbusSupport [ dbus ]
@ -30,6 +32,11 @@ rustPlatform.buildRustPackage rec {
buildFeatures = lib.optional notificationSupport "desktop-notifications";
checkFlags = [
# flaky test
"--skip=tests::config::parsing_tab_configs"
];
meta = with lib; {
description = "A console IRC client";
homepage = "https://github.com/osa1/tiny";

View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "seqkit";
version = "2.4.0";
version = "2.5.0";
src = fetchFromGitHub {
owner = "shenwei356";
repo = "seqkit";
rev = "v${version}";
sha256 = "sha256-v2Z94UDuXnT7eVFX+uLSxXR34eIBzRm1bHwD7gO9SVA=";
sha256 = "sha256-pk4HNtG2x3zZ+GEH5MNn/XPNSmx8zGWbVYPGCYIZucs=";
};
vendorHash = "sha256-dDMSwZnTWC60zvPDvUT+9T/mUUrhW0Itn87XO/+Ef2Q=";
vendorHash = "sha256-54kb9Na76+CgW61SnXu7EfO0InH/rjliNRcH2M/gxII=";
meta = with lib; {
description = "cross-platform and ultrafast toolkit for FASTA/Q file manipulation";

View file

@ -15,13 +15,13 @@
buildGoModule rec {
pname = "cri-o";
version = "1.27.0";
version = "1.27.1";
src = fetchFromGitHub {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
sha256 = "sha256-ZFt8KcEJ7iN2JgKbOGDgpq0+pjlxEU7V9GSX+c3VnbY=";
sha256 = "sha256-29lA497DTJ1AOqcfbgUCYcBqB8WUWWXBMqFOpyx93wY=";
};
vendorHash = null;

View file

@ -1,6 +1,6 @@
{ mkDerivation }:
mkDerivation {
version = "25.3.2.3";
sha256 = "TX63ju8WxqA+cBKg/0veYL0XtVgf4s/BlaNY5Pjuybw=";
version = "25.3.2.4";
sha256 = "U0hzGrLcJZndCGXz/4b9yXy21QGXbKAtc01H1QnwO4A=";
}

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libjwt";
version = "1.15.3";
version = "1.16.0";
src = fetchFromGitHub {
owner = "benmcollins";
repo = "libjwt";
rev = "v${version}";
sha256 = "sha256-as4tqvRY559Q2R3s4GZHovqsCboXNz/NcV5lo+qCeOk=";
sha256 = "sha256-5hbmEen31lB6Xdv5WU+8InKa0+1OsuB8QG0jVa1+a2w=";
};
buildInputs = [ jansson openssl ];

View file

@ -6,14 +6,14 @@
, zlib
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "msgpack-c";
version = "6.0.0";
src = fetchFromGitHub {
owner = "msgpack";
repo = "msgpack-c";
rev = "refs/tags/c-${version}";
rev = "refs/tags/c-${finalAttrs.version}";
hash = "sha256-TfC37QKwqvHxsLPgsEqJYkb7mpRQekbntbBPV4v4FO8=";
};
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DMSGPACK_BUILD_EXAMPLES=OFF" # examples are not installed even if built
] ++ lib.optional (!doCheck) "-DMSGPACK_BUILD_TESTS=OFF";
] ++ lib.optional (!finalAttrs.doCheck) "-DMSGPACK_BUILD_TESTS=OFF";
checkInputs = [
gtest
@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "MessagePack implementation for C";
homepage = "https://github.com/msgpack/msgpack-c";
changelog = "https://github.com/msgpack/msgpack-c/blob/${src.rev}/CHANGELOG.md";
changelog = "https://github.com/msgpack/msgpack-c/blob/${finalAttrs.src.rev}/CHANGELOG.md";
license = licenses.boost;
maintainers = with maintainers; [ nickcao ];
};
}
})

View file

@ -6,14 +6,14 @@
, zlib
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "msgpack-cxx";
version = "6.1.0";
src = fetchFromGitHub {
owner = "msgpack";
repo = "msgpack-c";
rev = "refs/tags/cpp-${version}";
rev = "refs/tags/cpp-${finalAttrs.version}";
hash = "sha256-VqzFmm3MmMhWyooOsz1d9gwwbn/fnnxpkCFwqKR6los=";
};
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DMSGPACK_BUILD_DOCS=OFF" # docs are not installed even if built
] ++ lib.optional doCheck "-DMSGPACK_BUILD_TESTS=ON";
] ++ lib.optional finalAttrs.doCheck "-DMSGPACK_BUILD_TESTS=ON";
checkInputs = [
zlib
@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "MessagePack implementation for C++";
homepage = "https://github.com/msgpack/msgpack-c";
changelog = "https://github.com/msgpack/msgpack-c/blob/${src.rev}/CHANGELOG.md";
changelog = "https://github.com/msgpack/msgpack-c/blob/${finalAttrs.src.rev}/CHANGELOG.md";
license = licenses.boost;
maintainers = with maintainers; [ nickcao ];
};
}
})

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "maestro";
version = "1.30.0";
version = "1.30.3";
src = fetchurl {
url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip";
sha256 = "1z9mrkxwfkp07z1k3kdgsda4dpb3hl3wa8mn0vwy3avh0k3my0px";
sha256 = "0y7qcm9f235xvfsavngsw650b3ibmzff2bf32axgp9w06bwfh8rq";
};
dontUnpack = true;

View file

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "duct-py";
version = "0.6.4";
format = "setuptools";
src = fetchFromGitHub {
owner = "oconnor663";
repo = "duct.py";
rev = version;
hash = "sha256-4ja/SQ9R/SbKlf3NqKxLi+Fl/4JI0Fl/zG9EmTZjWZc=";
};
pythonImportsCheck = [ "duct" ];
nativeCheckInputs = [
pytestCheckHook
];
disabledTests = [
# This test completely empties the environment then tries to run a Python command.
# The test then fails because it can't find the `python` executable. It's unclear
# how this test even passes _outside_ of Nix.
"test_full_env"
];
meta = with lib; {
description = "A Python library for running child processes";
homepage = "https://github.com/oconnor663/duct.py";
license = licenses.mit;
maintainers = with maintainers; [ zmitchell ];
};
}

View file

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "looseversion";
version = "1.2.0";
version = "1.3.0";
format = "flit";
src = fetchPypi {
inherit version pname;
sha256 = "sha256-xk5xwLKQMGg7Tqda7kMdstJcTm5TNZDlISnx2eUd4gQ=";
sha256 = "sha256-695l8/a7lTGoEBbG/vPrlaYRga3Ee3+UnpwOpHkRZp4=";
};
nativeCheckInputs = [

View file

@ -47,7 +47,6 @@ buildPythonPackage rec {
];
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
description = "Chameleon template compiler for pyramid";
homepage = "https://github.com/Pylons/pyramid_chameleon";
license = licenses.bsd0;

View file

@ -3,19 +3,24 @@
, buildPythonPackage
, fetchPypi
, python-dateutil
, poetry-core
, requests
}:
buildPythonPackage rec {
pname = "tidalapi";
version = "0.7.1";
format = "setuptools";
version = "0.7.2";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-ttOjw6VXR36QL/GUQXjpPWrE617Bmdt0piUsA4O5W/g=";
hash = "sha256-CyyvzhuDB9XgroeP+WPTJIufT3VU9fD6Pg2Q1prB0Mo=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
requests
python-dateutil

View file

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "unearth";
version = "0.9.1";
version = "0.9.2";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-cgWDKwhwBdG3RpA6U1yn0NtTgcH2Id3AApBSTVav0hc=";
hash = "sha256-hF9LVzOHTOO0JyEm3kluq+AKSa1nj90E1ILR533u1CU=";
};
nativeBuildInputs = [

View file

@ -4,12 +4,12 @@
buildPythonPackage rec {
pname = "webargs";
version = "8.2.0";
version = "8.3.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
hash = "sha256-mdaJQMRS4HcmSFoV/vQ/EviubAxbORvLp2Bl1FJ/uF0=";
hash = "sha256-yrIHlBsGhsTQhsgjYy3c1DQxUWRDQaMvz1C46qceMcc=";
};
pythonImportsCheck = [

View file

@ -10,13 +10,13 @@
buildGoModule rec {
pname = "runme";
version = "1.4.1";
version = "1.5.0";
src = fetchFromGitHub {
owner = "stateful";
repo = "runme";
rev = "v${version}";
hash = "sha256-VA5YgPq/zr3yN59VyrFoIlr/Utvq1P7wyPdsXpyFdxQ=";
hash = "sha256-tUeNgG54+gx0DT+0TvwCcLv5auV442pO+ulyuDLshsg=";
};
vendorHash = "sha256-BJhda5mE5f4kvi8CLjgMJYjdUS3vsUSwmHhTW/AVKCI=";

View file

@ -13,13 +13,13 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-espflash";
version = "2.0.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "esp-rs";
repo = "espflash";
rev = "v${version}";
hash = "sha256-3E0OC8DVP2muLyoN4DQfrdnK+idQEm7IpaA/CUIyYnU=";
hash = "sha256-PYW5OM3pbmROeGkbGiLhnVGrYq6xn3B1Z4sbIjtAPlk=";
};
nativeBuildInputs = [
@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
SystemConfiguration
];
cargoHash = "sha256-8VIAmmtaQoIvD7wN+W3yUM0CEDadOQrv1wnJ4/AWKFA=";
cargoHash = "sha256-gTehRP9Ct150n3Kdz+NudJcKGeOCT059McrXURhy2iQ=";
passthru.updateScript = nix-update-script { };

View file

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-local-registry";
version = "0.2.5";
version = "0.2.6";
src = fetchFromGitHub {
owner = "dhovart";
repo = "cargo-local-registry";
rev = version;
hash = "sha256-3xp0LLk3MpL54PMGLHTAKcsM6fwMxB8LOdN0Xcap/xA=";
hash = "sha256-2tSO82XRCUekEBrd9wDzxeg2r2C+F9wgz3ffYFG7+q8=";
};
cargoHash = "sha256-HknfcJfOQ40ecpKM8GGbquRxLQTEGyRFkwXhsjrl8FA=";
cargoHash = "sha256-vxdQLfr4G73MpPrrcbcQRZGbTHJztUP3FwShj6zFhEY=";
nativeBuildInputs = [
curl

View file

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "papermc";
version = "1.19.3.375";
version = "1.20.1.83";
jar = let
mcVersion = lib.versions.pad 3 version;
buildNum = builtins.elemAt (lib.versions.splitVersion version) 3;
in fetchurl {
url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar";
sha256 = "sha256-NAl4+mCkO6xQQpIx2pd9tYX2N8VQa+2dmFwyBNbDa10=";
sha256 = "sha256-HQpc3MOXa1wkXqgm9ciQj04FUIyuupnYiu+2RZ/sXE4=";
};
preferLocalBuild = true;

View file

@ -13,20 +13,39 @@
, libGLU
, SDL2
, freealut
, libglvnd
, pipewire
, libpulseaudio
, experimental ? false
, dotnet-runtime_7
}:
stdenv.mkDerivation rec {
pname = "vintagestory";
version = "1.18.6";
version = if experimental then "1.18.6" else "1.18.6";
src =
if experimental
then
(fetchurl {
url = "https://cdn.vintagestory.at/gamefiles/net7/vs_client_linux-x64_${version}.tar.gz";
sha256 = "sha256-h4TyMDFid3eB6oPJix92/tmS0v+Ox6CFSRyn/JRNbxg=";
})
else
(fetchurl {
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz";
sha256 = "sha256-Sa5R/Msg36pKRpZJXXJgM4lcCADJX9x81fMnTD3tjAI=";
});
src = fetchurl {
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz";
sha256 = "sha256-Sa5R/Msg36pKRpZJXXJgM4lcCADJX9x81fMnTD3tjAI=";
};
nativeBuildInputs = [ makeWrapper copyDesktopItems ];
buildInputs = [ mono ];
buildInputs =
if experimental then [
dotnet-runtime_7
] else [
mono
];
runtimeLibs = lib.makeLibraryPath ([
gtk2
@ -36,6 +55,9 @@ stdenv.mkDerivation rec {
libGLU
SDL2
freealut
libglvnd
pipewire
libpulseaudio
] ++ (with xorg; [
libX11
libXi
@ -43,7 +65,7 @@ stdenv.mkDerivation rec {
desktopItems = makeDesktopItem {
name = "vintagestory";
desktopName = "Vintage Story";
desktopName = if experimental then "Vintage Story Experimental .net 7" else "Vintage Story";
exec = "vintagestory";
icon = "vintagestory";
comment = "Innovate and explore in a sandbox world";
@ -61,14 +83,21 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
preFixup = ''
preFixup = (if experimental then ''
makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory \
--prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
--add-flags $out/share/vintagestory/Vintagestory.dll
makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory-server \
--prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
--add-flags $out/share/vintagestory/VintagestoryServer.dll
'' else ''
makeWrapper ${mono}/bin/mono $out/bin/vintagestory \
--prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
--add-flags $out/share/vintagestory/Vintagestory.exe
makeWrapper ${mono}/bin/mono $out/bin/vintagestory-server \
--prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
--add-flags $out/share/vintagestory/VintagestoryServer.exe
'') + ''
find "$out/share/vintagestory/assets/" -not -path "*/fonts/*" -regex ".*/.*[A-Z].*" | while read -r file; do
local filename="$(basename -- "$file")"
ln -sf "$filename" "''${file%/*}"/"''${filename,,}"
@ -79,6 +108,6 @@ stdenv.mkDerivation rec {
description = "An in-development indie sandbox game about innovation and exploration";
homepage = "https://www.vintagestory.at/";
license = licenses.unfree;
maintainers = with maintainers; [ artturin ];
maintainers = with maintainers; [ artturin gigglesquid ];
};
}

View file

@ -10,15 +10,15 @@ let
in
stdenv.mkDerivation rec {
pname = "urbit";
version = "2.10";
version = "2.11";
src = fetchzip {
url = "https://github.com/urbit/vere/releases/download/vere-v${version}/${platform}.tgz";
sha256 = {
x86_64-linux = "sha256-Bf0XDuGSBq8z9zouPQJyi/ZPEE6RzXb9+HCls89MR8Q=";
aarch64-linux = "sha256-Ecmc41X4AM3xigBvJGyWkIFxXM3vy+uK9p2M93UUJiY=";
x86_64-darwin = "sha256-eQSbzcP612LxOxdj9THPzyLtJwAthygjsSSct7vk1fc=";
aarch64-darwin = "sha256-VIXD8WHwAgRCLDZg1H5KmuiIqQMziWR6/4XxvSYtmTs=";
x86_64-linux = "sha256-k2zmcjZ9NXmwZf93LIAg1jx4IRprKUgdkvwzxEOKWDY=";
aarch64-linux = "sha256-atMBXyXwavpSDTZxUnXIq+NV4moKGRWLaFTM9Kuzt94=";
x86_64-darwin = "sha256-LSJ9jVY3fETlpRAkyUWa/2vZ5xAFmmMssvbzUfIBY/4=";
aarch64-darwin = "sha256-AViUt2N+YCgMWOcv3ZI0GfdYVOiRLbhseQ7TTq4zCiQ=";
}.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
};

View file

@ -6,12 +6,12 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "raycast";
version = "1.55.1";
version = "1.55.2";
src = fetchurl {
name = "Raycast.dmg";
url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal";
hash = "sha256-LklPE08OnrDQbHSYLplzVs8IkkuVrjq2fsBDCRD4dv0=";
hash = "sha256-O+9dSXmkNxeY0Rvjn7dcStk/cqmM4y+lrXa5MymYUcY=";
};
dontPatch = true;

View file

@ -3,12 +3,12 @@
buildGoModule rec {
pname = "imgproxy";
version = "3.18.1";
version = "3.18.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
hash = "sha256-gtCDeWQLXdhNc5Gn9020ib0IZxjVkHnOUHNf1vqsc0k=";
hash = "sha256-iMzaeB086VohyzUJqYxdnGi0grosrJD1H0AgK5A75XM=";
rev = "v${version}";
};

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "nginxlog_exporter";
version = "1.10.0";
version = "1.11.0";
src = fetchFromGitHub {
owner = "martin-helmich";
repo = "prometheus-nginxlog-exporter";
rev = "v${version}";
sha256 = "sha256-W+cLJUsg49Fwo2IsJjo0QZ0NLNy/H7E35Yjr7bsHAkQ=";
sha256 = "sha256-UkXrVHHHZ9mEgsMUcHu+wI6NZFw4h3X4atDBjpBcz8E=";
};
vendorSha256 = "sha256-Bdyk+yNVcxPDzxJQSE34HJCryWQSXa8748gJ5Fu+gP4=";
vendorHash = "sha256-RzqfmP1d3zqageiGSr+CxSJQxAXmOKRCwj/7KO2f3EE=";
subPackages = [ "." ];

View file

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "nats-server";
version = "2.9.19";
version = "2.9.20";
src = fetchFromGitHub {
owner = "nats-io";
repo = pname;
rev = "v${version}";
hash = "sha256-CiDvDnnUR/jaEWU+bceH6uIr9QBtsAz+6vnQjT3sNQQ=";
hash = "sha256-RRWn1xPvYkDL+81/JOAW+K8I2ezq+z65KiJPYMrF7Sw=";
};
vendorHash = "sha256-m/15F0BHCAEcNlRf71jJP5bjrrqRgX/CQm8SddpTkYw=";
vendorHash = "sha256-INzCHNr469LajEggVpVZ0Kj0zpe7GwX26af2C/7zx7o=";
doCheck = false;

View file

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "sozu";
version = "0.15.1";
version = "0.15.2";
src = fetchFromGitHub {
owner = "sozu-proxy";
repo = pname;
rev = version;
hash = "sha256-/0scNFOWDbL5SaXOC+/DGFE5OgJx1WkdruM+yFV6n1M=";
hash = "sha256-6CuBJUMymnqNx/675PeBuZNhYYh9HtU99J1LYO2+Rxc=";
};
cargoHash = "sha256-SVfAo7jsYIhgYHP4pity62TU1aGoH6E8UysJ/Gw+rDk=";
cargoHash = "sha256-c/TC8Mn9UFIymkXxD02iB6E3kKyeuKDgvlgapiV0Nco=";
nativeBuildInputs = [ protobuf ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "wishlist";
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "wishlist";
rev = "v${version}";
sha256 = "sha256-O2ciXaWH2QSoqDTnDxmqwgK/BM5WHye8JHfw9+zZxZ4=";
sha256 = "65V+Ge2QHLqRb4oiSF5Pbtpw70duIAcVmrp+tZCML2A=";
};
vendorHash = "sha256-wZugmCP3IouZ9pw3NEAZcoqdABMGTVi/IcithQjVFW4=";
vendorHash = "sha256-qz+OOqpvybBd7JlQmspIQKlBvTnFvMlyv+k00yO9rt8=";
doCheck = false;
@ -22,6 +22,6 @@ buildGoModule rec {
homepage = "https://github.com/charmbracelet/wishlist";
changelog = "https://github.com/charmbracelet/wishlist/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ penguwin ];
maintainers = with maintainers; [ caarlos0 penguwin ];
};
}

View file

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "okta-aws-cli";
version = "1.0.2";
version = "1.1.0";
subPackages = [ "cmd/okta-aws-cli" ];
@ -10,7 +10,7 @@ buildGoModule rec {
owner = "okta";
repo = "okta-aws-cli";
rev = "v${version}";
sha256 = "sha256-gC5/KwtawVfCx6C5kP0/ZesEzn9XxrPX/X8E8Mb/KUE=";
sha256 = "sha256-TRS1+msrp+Wd+9FhQSErZGvfpcRA5ltNKIyVHLveMOo=";
};
vendorHash = "sha256-AJmQxMRj602yodzIdhZV+R22KxnEIbT9iSz/5G5T6r8=";

View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "timg";
version = "1.5.0";
version = "1.5.1";
src = fetchFromGitHub {
owner = "hzeller";
repo = "timg";
rev = "v${version}";
hash = "sha256-1zv5+62roS0iSVXa1QXGKuO0Qd6D3e3tZD2HZ5czRRk=";
hash = "sha256-hGQL6MAsaSVV/w5fDKAcd4KIBuh2pvl3D2QUzi/aeG0=";
};
buildInputs = [

View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, jre, graphviz }:
stdenv.mkDerivation rec {
version = "1.2023.9";
version = "1.2023.10";
pname = "plantuml";
src = fetchurl {
url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar";
sha256 = "sha256-/X3eKLl+nXkWIjMB3w9oKBMfEJvdIdrleaYQMFJoXK0=";
sha256 = "sha256-/+B16MQ5fzaRS/SjyMgiUsC+8Y7McyuS3IEMRgtY7jQ=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -1,14 +1,15 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file , protobufc }:
{ lib, stdenv, fetchFromGitea, autoreconfHook, pkg-config, file , protobufc }:
stdenv.mkDerivation rec {
pname = "riemann-c-client";
version = "1.10.5";
src = fetchFromGitHub {
src = fetchFromGitea {
domain = "git.madhouse-project.org";
owner = "algernon";
repo = "riemann-c-client";
rev = "riemann-c-client-${version}";
sha256 = "sha256-LuI9XFDPx0qw/+kkpXd0FOMESERAp31R1+ttkGuJnPA=";
sha256 = "1w4wi5mr0vgbsx8pv9s08i409qqlfivsa979zyq4miyga1f3vqif";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
homepage = "https://github.com/algernon/riemann-c-client";
homepage = "https://git.madhouse-project.org/algernon/riemann-c-client";
description = "A C client library for the Riemann monitoring system";
license = licenses.gpl3;
maintainers = with maintainers; [ pradeepchhetri ];

View file

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "tbls";
version = "1.68.0";
version = "1.68.1";
src = fetchFromGitHub {
owner = "k1LoW";
repo = "tbls";
rev = "v${version}";
hash = "sha256-qFPTDyljSKWim8sZbDM5OZ4sHL4csqXxit4UdMnOTxs=";
hash = "sha256-z5tDPXz6Z6oPzWIp4gapNLwm+0VrwCGNIXsFu94Zn08=";
};
vendorHash = "sha256-Xxoe+8MKwZPPapTILHAIegGPBn8vaAjU5bZrd8RvazE=";
vendorHash = "sha256-V6TF7Q+9XxBeSVXlotu8tUrNCWDr80BZsQcVSBGikl8=";
CGO_CFLAGS = [ "-Wno-format-security" ];

View file

@ -5,17 +5,17 @@
}:
buildGoModule rec {
pname = "dae";
version = "0.2.0";
version = "0.2.1";
src = fetchFromGitHub {
owner = "daeuniverse";
repo = pname;
rev = "v${version}";
sha256 = "sha256-J2FFD6/+Of1UcBmgzlAfmX5QvEgJY4P1EttlNaqW4P0=";
sha256 = "sha256-+x9yqqlSj7mKT7A9yUaJJzRH8FR9pev3S2BzpXvnPu0=";
fetchSubmodules = true;
};
vendorHash = "sha256-2KKlbhJtoHUa02juXuS1QgvDD5LA5Tg/f0hNFscLJIQ=";
vendorHash = "sha256-8Pqt2rVtekgARcP0m9pwPO/ftffVkdwvQAcjrd1EI8g=";
proxyVendor = true;

View file

@ -26,10 +26,10 @@ let
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash = {
x64-linux_hash = "sha256-aEcinTJlO++rTeyqGJea0TWtleH6fyooA8RhT0Qj24c=";
arm64-linux_hash = "sha256-9Gyk09zAGzahP8FCGxj037vaK8h++3M5R2Qqop99Gs4=";
x64-osx_hash = "sha256-c87eOZBz+RtbIi+dlXKKVMyPI8JqYDuiaL4xOkDRFn0=";
arm64-osx_hash = "sha256-zSHgLXRDB6UA7V0LFgLq9ChqB40IHIJJxRqAYyVFlB8=";
x64-linux_hash = "sha256-LSnMXNXQDx45AlQi1IBbMQBBgMc0gJsSa0GV5G5UBPk=";
arm64-linux_hash = "sha256-KkWAPXHaGCc8hsAMohbO7R0ZcfySlu1z+dRjNICaH+Y=";
x64-osx_hash = "sha256-cFerz4g2hPcIqOAeIURD06v6Wr+Rs0xpMHYmG8xl250=";
arm64-osx_hash = "sha256-Kl7lcJUaNeJ/xyd4Fh0f5Li8AyxrcQQgDSfxB3j2L1g=";
}."${arch}-${os}_hash";
libPath = {
@ -40,7 +40,7 @@ let
in
stdenv.mkDerivation rec {
pname = "recyclarr";
version = "5.1.0";
version = "5.1.1";
src = fetchurl {
url = "https://github.com/recyclarr/recyclarr/releases/download/v${version}/recyclarr-${os}-${arch}.tar.xz";

View file

@ -509,6 +509,8 @@ with pkgs;
crc = callPackage ../applications/networking/cluster/crc { };
confetty = callPackage ../applications/misc/confetty { };
confy = callPackage ../applications/misc/confy { };
coordgenlibs = callPackage ../development/libraries/coordgenlibs { };
@ -35420,6 +35422,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
typer = callPackage ../applications/misc/typer { };
ueberzug = with python3Packages; toPythonApplication ueberzug;
ueberzugpp = darwin.apple_sdk_11_0.callPackage ../tools/graphics/ueberzugpp { };

View file

@ -3137,6 +3137,8 @@ self: super: with self; {
duckduckgo-search = callPackage ../development/python-modules/duckduckgo-search { };
duct-py = callPackage ../development/python-modules/duct-py { };
duecredit = callPackage ../development/python-modules/duecredit { };
duet = callPackage ../development/python-modules/duet { };