cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2023-06-04 00:02:20 +00:00 committed by GitHub
commit d41df69d22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 129 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View file

@ -11813,6 +11813,12 @@
githubId = 30825096;
name = "Ning Zhang";
};
oaksoaj = {
email = "oaksoaj@riseup.net";
name = "Oaksoaj";
github = "oaksoaj";
githubId = 103952141;
};
obadz = {
email = "obadz-nixos@obadz.com";
github = "obadz";

4
pkgs/applications/blockchains/exodus/default.nix
View file

@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }:
stdenv.mkDerivation rec {
pname = "exodus";
version = "23.5.8";
version = "23.5.22";
src = fetchzip {
url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip";
sha256 = "sha256-3mABHkxEMS985NqQBZ7HijtTiun1iSXFJmi0qOh3m7g=";
sha256 = "sha256-CZuT0nlKyF7LRGqNezm98MHcQa2Uhd8y+NiKE5mi0jk=";
};
installPhase = ''

4
pkgs/applications/networking/cluster/kubedog/default.nix
View file

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "kubedog";
version = "0.9.11";
version = "0.9.12";
src = fetchFromGitHub {
owner = "werf";
repo = "kubedog";
rev = "v${version}";
hash = "sha256-yHyCmUjxvMzeHpG5OqC3nAjWaiHErTXrbmS+/0Y4A7E=";
hash = "sha256-B667EnlOD0kXqkW73XXcyQwROWh5SmsM8565sjcGinI=";
};
vendorHash = "sha256-OgfgCsysNtY7mZQXdmHFyJ0FqmBD3SeQdTLd5Lw3F7k=";

4
pkgs/applications/networking/cluster/odo/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "odo";
version = "3.10.0";
version = "3.11.0";
src = fetchFromGitHub {
owner = "redhat-developer";
repo = "odo";
rev = "v${version}";
sha256 = "sha256-J8Oiw7/jPwIoPh8erL7auSiQCRzvY7i4COPmtI3qPXY=";
sha256 = "sha256-+5oX6/J/WpJZr/o9l8TZhMJoxonnT0DeIEWffAjZYww=";
};
vendorHash = null;

4
pkgs/applications/networking/cluster/terragrunt/default.nix
View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.45.16";
version = "0.45.18";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-q12MXqYf4yXC1ifXCuHE75Eb553TWbohDB2GusRpNIM=";
hash = "sha256-J4edaMLvL9Bs1bwF+m0LMGiGmEKa7Xcb3SgOiDldTyY=";
};
vendorHash = "sha256-5Umoqi2D6iUk2Ut7YB/nmkOyA6Rx2qFhy/ZbfqoX5qA=";

4
pkgs/applications/networking/instant-messengers/ferdium/default.nix
View file

@ -3,10 +3,10 @@
mkFranzDerivation rec {
pname = "ferdium";
name = "Ferdium";
version = "6.2.6";
version = "6.3.0";
src = fetchurl {
url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-amd64.deb";
sha256 = "sha256-jG3NdolWqQzj/62jYwnqJHz5uT6QIuOkrpL/FcLl56k=";
sha256 = "sha256-3i3cEGwUXNITABJRXV+xQ2knYjuG1F818EvhLBrVep8=";
};
extraBuildInputs = [ xorg.libxshmfence ];

27
pkgs/applications/networking/irc/thelounge/default.nix
View file

@ -1,4 +1,18 @@
{ lib, stdenv, fetchFromGitHub, fetchYarnDeps, yarn, fixup_yarn_lock, nodejs, npmHooks, nixosTests }:
{ lib
, stdenv
, fetchFromGitHub
, fetchYarnDeps
, nodejs
, yarn
, fixup_yarn_lock
, python3
, npmHooks
, darwin
, sqlite
, srcOnly
, buildPackages
, nixosTests
}:
stdenv.mkDerivation (finalAttrs: {
pname = "thelounge";
@ -24,7 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-OKLsNGl94EDyLgP2X2tiwihgRQFXGvf5XgXwgX+JEpk=";
};
nativeBuildInputs = [ nodejs yarn fixup_yarn_lock npmHooks.npmInstallHook ];
nativeBuildInputs = [ nodejs yarn fixup_yarn_lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.isDarwin darwin.cctools;
buildInputs = [ sqlite ];
configurePhase = ''
runHook preConfigure
@ -49,8 +64,14 @@ stdenv.mkDerivation (finalAttrs: {
# `npm prune` doesn't work and/or hangs for whatever reason.
preInstall = ''
rm -rf node_modules
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive --production
patchShebangs node_modules
# Build the sqlite3 package.
npm_config_nodedir="${srcOnly nodejs}" npm_config_node_gyp="${buildPackages.nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" npm rebuild --verbose --sqlite=${sqlite.dev}
# These files seemingly aren't needed, and also might not exist when the Darwin sandbox is disabled?
rm -rf node_modules/sqlite3/build-tmp-napi-v6/{Release/obj.target,node_sqlite3.target.mk}
'';
dontNpmPrune = true;

41
pkgs/applications/version-management/delta/default.nix
View file

@ -1,38 +1,47 @@
{ stdenv
, lib
, fetchFromGitHub
{ lib
, rustPlatform
, fetchFromGitHub
, installShellFiles
, DiskArbitration
, Foundation
, libiconv
, Security
, pkg-config
, oniguruma
, stdenv
, darwin
, git
}:
rustPlatform.buildRustPackage rec {
pname = "delta";
version = "0.16.4";
version = "0.16.5";
src = fetchFromGitHub {
owner = "dandavison";
repo = pname;
rev = version;
hash = "sha256-lIOJPDnSwyPVhmBUPCiWtpNNxXGRKVruidBKIF9tFvo=";
hash = "sha256-W6XtfXfOP8QfQ0t5hquFdYvCO9muE50N1fQsNtnOzfM=";
};
cargoHash = "sha256-7+SwJ64PJvBi0YOeYcfqsN2f5ehj/t7XhniWd4jWJnM=";
cargoHash = "sha256-SNKbgEyelJCHKCaBRfCGc3RECGABtZzMC2rCbhzqZtU=";
nativeBuildInputs = [ installShellFiles ];
nativeBuildInputs = [
installShellFiles
pkg-config
];
buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation libiconv Security ];
buildInputs = [
oniguruma
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk_11_0.frameworks.Foundation
];
nativeCheckInputs = [ git ];
env = {
RUSTONIG_SYSTEM_LIBONIG = true;
};
postInstall = ''
installShellCompletion --bash --name delta.bash etc/completion/completion.bash
installShellCompletion --zsh --name _delta etc/completion/completion.zsh
installShellCompletion --fish --name delta.fish etc/completion/completion.fish
installShellCompletion --cmd delta \
etc/completion/completion.{bash,fish,zsh}
'';
checkFlags = lib.optionals stdenv.isDarwin [
@ -44,6 +53,6 @@ rustPlatform.buildRustPackage rec {
description = "A syntax-highlighting pager for git";
changelog = "https://github.com/dandavison/delta/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ marsam zowoq SuperSandro2000 ];
maintainers = with maintainers; [ marsam zowoq SuperSandro2000 figsoda ];
};
}

6
pkgs/applications/virtualization/lima/default.nix
View file

@ -11,16 +11,16 @@
buildGoModule rec {
pname = "lima";
version = "0.15.1";
version = "0.16.0";
src = fetchFromGitHub {
owner = "lima-vm";
repo = pname;
rev = "v${version}";
sha256 = "sha256-uZE827dc79i7JPxHDI3kmAANN9XUIuhR0c9BUe92DyQ=";
sha256 = "sha256-6BNUuYAy3rUpPeUsbLRpz0+LdgVeHjlVjmQRcuFSXEg=";
};
vendorHash = "sha256-CysPzlup8TVVR4rCm3cWTjnxwJznMv0wbaeCC0ofWSU=";
vendorHash = "sha256-KuMEAlXvW5FhTC7HQa3CoqRlhtwSBzjk+dgAnzScfno=";
nativeBuildInputs = [ makeWrapper installShellFiles ]
++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ];

4
pkgs/applications/window-managers/sway/fx.nix
View file

@ -2,13 +2,13 @@
sway-unwrapped.overrideAttrs (oldAttrs: rec {
pname = "swayfx";
version = "0.3";
version = "0.3.1";
src = fetchFromGitHub {
owner = "WillPower3309";
repo = "swayfx";
rev = version;
sha256 = "sha256-3Odyeb10AGbNf6TI1W79sLiwB4PrszC5VzjCr7FuPz4=";
sha256 = "sha256-Ox+ror8sCc4mFOqZ1H9782hWbkTSUs5IVYEubHuyoJQ=";
};
# This patch was backported into SwayFX

3
pkgs/development/perl-modules/strip-nondeterminism/default.nix
View file

@ -28,10 +28,9 @@ buildPerlPackage rec {
buildInputs = [
ArchiveZip
ArchiveCpio
SubOverride
];
nativeCheckInputs = [ SubOverride ];
postPatch = ''
substituteInPlace lib/File/StripNondeterminism.pm \
--replace "exec('file'" "exec('${lib.getExe file}'"

4
pkgs/development/python-modules/aio-pika/default.nix
View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "aio-pika";
version = "9.0.7";
version = "9.1.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "mosquito";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-4RZxpLQ8YcPRXrF0mJcteUwejlIQx0CIy0cFpfMW/RU=";
hash = "sha256-iyy6HaB3S/CPYuo62SThe3m96eg9rPTMaKg2KWt0Kf0=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/aiokafka/default.nix
View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "aiokafka";
version = "0.8.0";
version = "0.8.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "aio-libs";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-g7xUB5RfjG4G7J9Upj3KXKSePa+VDit1Zf8pWHfui1o=";
hash = "sha256-O5cDP0PWFrxNSdwWqUUkErUKf1Tt9agKJqWIjd4jGqk=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/aiopvpc/default.nix
View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "aiopvpc";
version = "4.1.0";
version = "4.2.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "azogue";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-ixHLFVPlDZKQkPMrOt8PG5z+e84UlygQutkyS8wCZR4=";
hash = "sha256-gfF/SFfiZgkWH0cQZF3hxEp6xxRi46nfDBB23Gerv5g=";
};
postPatch = ''

4
pkgs/development/python-modules/bitarray/default.nix
View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "bitarray";
version = "2.7.3";
version = "2.7.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-9xJWoyYJsDatrZMuEii2amtOLK5r45fliN3Aur2aeLk=";
hash = "sha256-FD1PZeH0WlM+E1Ib4dxVengjF+z3ZSDqvVqQOybssYc=";
};
checkPhase = ''

4
pkgs/development/python-modules/rns/default.nix
View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "rns";
version = "0.5.3";
version = "0.5.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "markqvist";
repo = "Reticulum";
rev = "refs/tags/${version}";
hash = "sha256-SZx0GBpYDC7p7yLVY5WZmBgpbpcl9GbsfdqH0YBrUgQ=";
hash = "sha256-OFU61RX6XtC/7x3SWbRCsODTrs3k3FCTCvEapkkeWQU=";
};
propagatedBuildInputs = [

4
pkgs/development/tools/ddosify/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ddosify";
version = "1.0.1";
version = "1.0.3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-QinC03SdJ0V2t69LJYsoV+KV13D+OcTkLetFe8vLF3Y=";
sha256 = "sha256-SkKETcKlH6OF6+gLBq/6P7txcmMRxoXc1Mm005piCHc=";
};
vendorHash = "sha256-cGhMhX+SEv9fejViLZrEwXg584o204OQ5iR6AkxKnXo=";

4
pkgs/games/vintagestory/default.nix
View file

@ -17,11 +17,11 @@
stdenv.mkDerivation rec {
pname = "vintagestory";
version = "1.17.11";
version = "1.18.5";
src = fetchurl {
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz";
sha256 = "sha256-iIQRwnJX+7GJcOqXJutInqpSX2fKlPmwFFAq6TqNWWY=";
sha256 = "sha256-VW85a8Yi1s+cOSZU5E/Rhhz4IMNLMtdAfOZKJ0axApA=";
};
nativeBuildInputs = [ makeWrapper copyDesktopItems ];

4
pkgs/servers/jackett/default.nix
View file

@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
version = "0.21.88";
version = "0.21.114";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha512-N1+6DK8o7pDUtpVcxvCCFAE9+mvk1QNk1Hkx0boOxYwhvxDX+QIULEioJ2H4ClZDat5riaFT873cWnNNtBJsaQ==";
hash = "sha512-CwK6nKsI9SrY9lE8THRVe+q0fMLxiLAdeCW7rewI2XtIeIDUy7kDYBujIlbxNdAjT+QgsN3E0oC/+nIyRqqFUg==";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";

6
pkgs/tools/admin/qovery-cli/default.nix
View file

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "qovery-cli";
version = "0.58.15";
version = "0.59.0";
src = fetchFromGitHub {
owner = "Qovery";
repo = pname;
rev = "v${version}";
hash = "sha256-sADeiFzVSk4Y0ZHvSoBVbtGp/YWO8ioYzZ+FXO9A7Tg=";
hash = "sha256-EPnuCmkJrjj9STO/FlDNYZmyqTAgTHvqxTxmQcgJLmQ=";
};
vendorHash = "sha256-Jwg+c+61kCytOkrwzJJCOjIGrv832G7n/kUDLGIJ5xA=";
vendorHash = "sha256-nW1PZ/cg7rU3e729H9I4Mqi/Q9wbSFMvtl0Urv9Fl8E=";
nativeBuildInputs = [ installShellFiles ];

26
pkgs/tools/misc/basez/default.nix Normal file
View file

@ -0,0 +1,26 @@
{ lib, stdenv, fetchurl } :
stdenv.mkDerivation rec {
pname = "basez";
version = "1.6.2";
src = fetchurl {
url = "http://www.quarkline.net/basez/download/basez-${version}.tar.gz";
sha256 = "sha256-Kp+CFIh5HCdj7wEgx1xD3IPdFlZ7fEFvMDMYif1ZiTc=";
};
doCheck = true;
meta = with lib; {
description = "Base 16/32/64 encode/decode data to standard output";
longDescription = ''
Encode data into/decode data from base16, base32, base32hex, base64 or
base64url stream per RFC 4648; MIME base64 Content-Transfer-Encoding
per RFC 2045; or PEM Printable Encoding per RFC 1421.
'';
homepage = "http://www.quarkline.net/basez/";
license = licenses.gpl3Plus;
maintainers = [ maintainers.oaksoaj ];
platforms = platforms.all;
};
}

4
pkgs/tools/misc/gh-markdown-preview/default.nix
View file

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gh-markdown-preview";
version = "1.4.0";
version = "1.4.1";
src = fetchFromGitHub {
owner = "yusukebe";
repo = "gh-markdown-preview";
rev = "v${version}";
hash = "sha256-WAKGtwz0CNqx86YOeLKWwfJiFcRAm1+X5kJOfsPgtjY=";
hash = "sha256-Q+e3j+X/ZsLdkTBkuu028Rl4iw+oES2w6CDQiwN+CtU=";
};
vendorHash = "sha256-O6Q9h5zcYAoKLjuzGu7f7UZY0Y5rL2INqFyJT2QZJ/E=";

14
pkgs/tools/misc/hyperfine/default.nix
View file

@ -1,6 +1,6 @@
{ lib
, rustPlatform
, fetchCrate
, fetchFromGitHub
, installShellFiles
, stdenv
, Security
@ -8,14 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "hyperfine";
version = "1.16.1";
version = "0.17.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-OdOlFdhIYxBi3e94QAief0xZqVdr+wnbaPFSKJ20DNM=";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "hyperfine";
rev = "v${version}";
hash = "sha256-IUjOklkEiy/U2HjjMt1X1uSpIkTAYOPiPQ+70xvvxKA=";
};
cargoSha256 = "sha256-RgoMq52GkRbfhsBipMKhCSu3YQoOtDB/Fdg+9OPzGtk=";
cargoHash = "sha256-cm6opZrdSEY4qsYQzgCJ8wx6iIIuytySWh3F3Roo/JQ=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optional stdenv.isDarwin Security;

6
pkgs/top-level/all-packages.nix
View file

@ -1510,6 +1510,8 @@ with pkgs;
balena-cli = callPackage ../tools/admin/balena-cli { };
basez = callPackage ../tools/misc/basez { };
butler = callPackage ../games/itch/butler.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
@ -1883,9 +1885,7 @@ with pkgs;
darcs-to-git = callPackage ../applications/version-management/darcs-to-git { };
delta = darwin.apple_sdk_11_0.callPackage ../applications/version-management/delta {
inherit (darwin.apple_sdk_11_0.frameworks) DiskArbitration Foundation Security;
};
delta = darwin.apple_sdk_11_0.callPackage ../applications/version-management/delta { };
diff-so-fancy = callPackage ../applications/version-management/diff-so-fancy { };