From 42488e8793ec0d846308faea33b045326cb5ff3e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 26 Jul 2023 04:20:00 +0000 Subject: [PATCH 1/9] zfs-autobackup: 3.1 -> 3.1.3 Changelog: https://github.com/psy0rz/zfs_autobackup/releases/tag/v3.1.3 --- pkgs/tools/backup/zfs-autobackup/default.nix | 30 +++++++++----------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/backup/zfs-autobackup/default.nix b/pkgs/tools/backup/zfs-autobackup/default.nix index a7453119a9d0..abbc413278be 100644 --- a/pkgs/tools/backup/zfs-autobackup/default.nix +++ b/pkgs/tools/backup/zfs-autobackup/default.nix @@ -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; [ ]; }; From e571bb68fdba3b890e40794f5558caec88a8df4d Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 29 Jul 2023 22:08:14 +0900 Subject: [PATCH 2/9] feishin: fix darwin build I think it still needs to be modified to actually work with darwin. --- pkgs/applications/audio/feishin/darwin.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/feishin/darwin.nix b/pkgs/applications/audio/feishin/darwin.nix index cd486ea430c6..b8b28f476821 100644 --- a/pkgs/applications/audio/feishin/darwin.nix +++ b/pkgs/applications/audio/feishin/darwin.nix @@ -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="; }; From ee85c7491996251b99461babd60008b57526139c Mon Sep 17 00:00:00 2001 From: oluceps Date: Sat, 29 Jul 2023 22:42:14 +0800 Subject: [PATCH 3/9] ddns-go: init at 5.5.1 --- pkgs/tools/networking/ddns-go/default.nix | 32 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/networking/ddns-go/default.nix diff --git a/pkgs/tools/networking/ddns-go/default.nix b/pkgs/tools/networking/ddns-go/default.nix new file mode 100644 index 000000000000..97b34f85a546 --- /dev/null +++ b/pkgs/tools/networking/ddns-go/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c48b73f18c0..31df042ebbe9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37262,6 +37262,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 { From ad66cedc57acb8b8bf1b23eb10e3694323e42635 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 29 Jul 2023 20:31:02 +0000 Subject: [PATCH 4/9] python310Packages.ppft: 1.7.6.6 -> 1.7.6.7 --- pkgs/development/python-modules/ppft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index 1dce18366b76..3a868d78d86d 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -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 = [ From 77f921c37e679e133309ac9ba5ac44c9ebc54f66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Jul 2023 00:58:22 +0000 Subject: [PATCH 5/9] grpc-gateway: 2.16.0 -> 2.16.1 --- pkgs/development/tools/grpc-gateway/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/grpc-gateway/default.nix b/pkgs/development/tools/grpc-gateway/default.nix index 84174993ef2f..1d9ebaf09a77 100644 --- a/pkgs/development/tools/grpc-gateway/default.nix +++ b/pkgs/development/tools/grpc-gateway/default.nix @@ -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 = From a8806a8a5b5137afc75b44bf44306c761a7c95ff Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 30 Jul 2023 09:19:38 +0800 Subject: [PATCH 6/9] cadvisor: 0.46.0 -> unstable-2023-07-28 Diff: https://github.com/google/cadvisor/compare/v0.46.0...fdd3d9182bea6f7f11e4f934631c4abef3aa0584 --- pkgs/servers/monitoring/cadvisor/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index acd6d918016e..79780d39d853 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -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"; From 4dfdcda6a0e7a8af9b813d6271b52803ddf42559 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Jul 2023 01:37:56 +0000 Subject: [PATCH 7/9] credhub-cli: 2.9.17 -> 2.9.18 --- pkgs/tools/admin/credhub-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix index c2849d6afd4c..78d9e1d0fbcd 100644 --- a/pkgs/tools/admin/credhub-cli/default.nix +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -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 From 784fbc1811241c71ac0ab8a660959a91a3f43f48 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 29 Jul 2023 23:12:40 -0400 Subject: [PATCH 8/9] cargo-nextest: 0.9.54 -> 0.9.55 Diff: https://github.com/nextest-rs/nextest/compare/cargo-nextest-0.9.54...cargo-nextest-0.9.55 Changelog: https://nexte.st/CHANGELOG.html --- pkgs/development/tools/rust/cargo-nextest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index a7725ad4eefc..632c0378ab89 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -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 ]; From b5c14b308306001af4e672b92e85a9e30aa64be8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 30 Jul 2023 03:07:52 +0000 Subject: [PATCH 9/9] terraform-providers.minio: 1.17.0 -> 1.17.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8ac7161bea16..f64f56b14e59 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -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=" },