Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -1,6 +1,8 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, meta
|
||||
, fetchurl
|
||||
, unzip
|
||||
, mpv
|
||||
, electron_24
|
||||
, makeDesktopItem
|
||||
@@ -14,7 +16,7 @@ stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-mac-x64.zip"
|
||||
url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-mac-x64.zip";
|
||||
hash = "sha256-WzU/Yd3cNMIpmkKWC29mQlviYXiYV5k8+80iyzilPGc=";
|
||||
};
|
||||
|
||||
|
||||
@@ -736,11 +736,11 @@
|
||||
"vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI="
|
||||
},
|
||||
"minio": {
|
||||
"hash": "sha256-B/3hT/R5tdbJ8IYScCLSklDD8aRnmSgX48DeM3DGGOw=",
|
||||
"hash": "sha256-BsOSImEMgxjldAQ014M25Y/JuxxaJLRdOOOHNAtm/Bg=",
|
||||
"homepage": "https://registry.terraform.io/providers/aminueza/minio",
|
||||
"owner": "aminueza",
|
||||
"repo": "terraform-provider-minio",
|
||||
"rev": "v1.17.0",
|
||||
"rev": "v1.17.1",
|
||||
"spdx": "Apache-2.0",
|
||||
"vendorHash": "sha256-Pr5YNDMVNccjQRC5WXUY+0pMTMbuxKqkqtd/Z/z0cXc="
|
||||
},
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ppft";
|
||||
version = "1.7.6.6";
|
||||
version = "1.7.6.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-+TPwQE8+gIvIYHRayzt5zU/jHqGaIIiaZF+QBBW+YPE=";
|
||||
hash = "sha256-qzRDaBTi8YI481aI/YabJkGy0tjcoiuNJG9nAd/JVMg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grpc-gateway";
|
||||
version = "2.16.0";
|
||||
version = "2.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc-ecosystem";
|
||||
repo = "grpc-gateway";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yoy3wESegXxlyaelex2gqr3GdzwwjxK7YTAzDCILr/c=";
|
||||
sha256 = "sha256-SqHGPfmLBLVniknulTVRM+2lpRuL0n7Vvj+joq/uz0o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dxzAiLEiZ+2+J9ZrkBemUt+slxz1zUa9Fx0VhUjFdN0=";
|
||||
vendorHash = "sha256-piAJj/B9DfjbwXZR6EAwk36vhJvuiX/IEabdctOtwy8=";
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-nextest";
|
||||
version = "0.9.54";
|
||||
version = "0.9.55";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextest-rs";
|
||||
repo = "nextest";
|
||||
rev = "cargo-nextest-${version}";
|
||||
hash = "sha256-HkDGW91XDoYMfknPg6td51KTYniCfGtGQd3dkzumRpo=";
|
||||
hash = "sha256-RiQf2cbgAif1bGzjqUBcD+XhHApEp9aGOwnrzqGEOZ4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-McL5G/PtdOou17hWLiNTSJEjTh4YpT1GUPjTMAVNxQA=";
|
||||
cargoHash = "sha256-0JSRgsr+9q/K3Pgh/8WXYCnV9DkM5oA8Pw9gJ61ktoM=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
||||
@@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cadvisor";
|
||||
version = "0.46.0";
|
||||
version = "unstable-2023-07-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "cadvisor";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ciGj8SK7OgK3x8Njih4aIQ0vvNV9s5/w2i+DF/vw1O8=";
|
||||
rev = "fdd3d9182bea6f7f11e4f934631c4abef3aa0584";
|
||||
hash = "sha256-U6oZ80EYx56FJ7VsDKzCXH4TvFEH+oPmgK/Nd8T/Zp4=";
|
||||
};
|
||||
|
||||
modRoot = "./cmd";
|
||||
|
||||
vendorSha256 = "sha256-dg+osxsxdJ8Tg++wdd4L6FMjiPLLFQj0NXb2aSC7vQg=";
|
||||
vendorHash = "sha256-hvgObwmNKk6yTJSyEHuHZ5abuXGPwPC42xUSAAF8UA0=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/google/cadvisor/version.Version=${version}" ];
|
||||
|
||||
@@ -22,10 +22,6 @@ buildGoModule rec {
|
||||
rm $out/bin/example
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
rm internal/container/mesos/handler_test.go
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Analyzes resource usage and performance characteristics of running docker containers";
|
||||
homepage = "https://github.com/google/cadvisor";
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "credhub-cli";
|
||||
version = "2.9.17";
|
||||
version = "2.9.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudfoundry-incubator";
|
||||
repo = "credhub-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-sxIyiUw5bI2M5mndjt6l5i5WJej24mMdmXrV5MbwTY8=";
|
||||
sha256 = "sha256-Fr9hV8mPBIid/5jR5u6jiGjr7a9HbSVCaReXx9jGo/Q=";
|
||||
};
|
||||
|
||||
# these tests require network access that we're not going to give them
|
||||
|
||||
@@ -1,32 +1,30 @@
|
||||
{ lib, python3Packages, fetchPypi }:
|
||||
|
||||
let
|
||||
pythonPackages = python3Packages;
|
||||
|
||||
in
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "zfs_autobackup";
|
||||
version = "3.1";
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "zfs-autobackup";
|
||||
version = "3.1.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "42c22001717b3d7cfdae6297fedc11b2dd1eb2a4bd25b6bb1c9232dd3b70ad67";
|
||||
inherit version;
|
||||
pname = "zfs_autobackup";
|
||||
sha256 = "sha256-ckikq8Am81O0wkL4ozRBFTCa15PrmkD54A2qEY6kA5c=";
|
||||
};
|
||||
|
||||
# argparse is part of the standardlib
|
||||
prePatch = ''
|
||||
substituteInPlace setup.py --replace "argparse" ""
|
||||
'';
|
||||
nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ];
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [ colorama ];
|
||||
propagatedBuildInputs = with python3Packages; [ colorama ];
|
||||
|
||||
pythonRemoveDeps = [ "argparse" ];
|
||||
|
||||
# tests need zfs filesystem
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "colorama" "argparse" ];
|
||||
|
||||
pythonImportsCheck = [ "zfs_autobackup" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/psy0rz/zfs_autobackup";
|
||||
description = "ZFS backup, replicationand snapshot tool";
|
||||
homepage = "https://github.com/psy0rz/zfs_autobackup";
|
||||
changelog = "https://github.com/psy0rz/zfs_autobackup/releases/tag/v${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ddns-go";
|
||||
version = "5.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeessy2";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fjfY0QLXewbjpoTbPjSEyrTXppzZ/LjvkFjc782Scp0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-azsXfWa4w3wZaiy9AKy7UPOybikubcJvLsXthYedmbY=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=${version}"
|
||||
];
|
||||
|
||||
# network required
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib;{
|
||||
homepage = "https://github.com/jeessy2/ddns-go";
|
||||
description = "Simple and easy to use DDNS";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ oluceps ];
|
||||
};
|
||||
}
|
||||
@@ -37177,6 +37177,8 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL Security;
|
||||
};
|
||||
|
||||
ddns-go = callPackage ../tools/networking/ddns-go { };
|
||||
|
||||
devilutionx = callPackage ../games/devilutionx {
|
||||
fmt = fmt_9;
|
||||
SDL2 = SDL2.override {
|
||||
|
||||
Reference in New Issue
Block a user