From a96c9768b02517474d45a733462e6dc7e21bd51b Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 26 Jun 2023 15:39:20 +0000 Subject: [PATCH 01/39] dcrctl: init at 1.8.0 --- .../blockchains/dcrctl/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/blockchains/dcrctl/default.nix diff --git a/pkgs/applications/blockchains/dcrctl/default.nix b/pkgs/applications/blockchains/dcrctl/default.nix new file mode 100644 index 000000000000..31e56254ee78 --- /dev/null +++ b/pkgs/applications/blockchains/dcrctl/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "dcrctl"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "decred"; + repo = "dcrctl"; + rev = "release-v${version}"; + hash = "sha256-Nm1r3hHTlW5ob2CLKUgMjVsdzR2gxlFuT6Q3j0pPDSg="; + }; + + vendorHash = "sha256-Ry3wR2u+vr97icP9jwAVWcFO98JVDo9TrDg9D8hfv5I="; + + ldflags = [ "-s" "-w" ]; + + meta = { + homepage = "https://decred.org"; + description = "A secure Decred wallet daemon written in Go (golang)"; + license = with lib.licenses; [ isc ]; + maintainers = with lib.maintainers; [ aaronjheng ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa04bb841012..2cc6ff01b201 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36127,6 +36127,7 @@ with pkgs; cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; + dcrctl = callPackage ../applications/blockchains/dcrctl { }; dcrd = callPackage ../applications/blockchains/dcrd { }; dcrwallet = callPackage ../applications/blockchains/dcrwallet { }; From 3acc9eb7afc2283102c7ef6b2574360800819d9d Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 26 Jun 2023 22:35:52 -0400 Subject: [PATCH 02/39] tailer: init at unstable-2023-06-26 https://github.com/hionay/tailer --- pkgs/tools/misc/tailer/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/misc/tailer/default.nix diff --git a/pkgs/tools/misc/tailer/default.nix b/pkgs/tools/misc/tailer/default.nix new file mode 100644 index 000000000000..7f39dfd5815f --- /dev/null +++ b/pkgs/tools/misc/tailer/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule { + pname = "tailer"; + version = "unstable-2023-06-26"; + + src = fetchFromGitHub { + owner = "hionay"; + repo = "tailer"; + rev = "2f32e2640a220c990ae419d1562889971c9ed535"; + hash = "sha256-L+5HlUv6g2o6ghqp8URfR7k5NlWqFhVBmEIsEjGy7aU="; + }; + + vendorHash = "sha256-nQqSvfN+ed/g5VkbD6XhZNA1G3CGGfwFDdadJ5+WoD0="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "A CLI tool to insert lines when command output stops"; + homepage = "https://github.com/hionay/tailer"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b85950f1e450..54880b628b98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13038,6 +13038,8 @@ with pkgs; tagtime = callPackage ../applications/misc/tagtime { }; + tailer = callPackage ../tools/misc/tailer { }; + inherit (callPackages ../applications/networking/taler { }) taler-exchange taler-merchant; From ef1e57456fa796ee8ffee2276675fba71ed1c84b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 27 Jun 2023 04:20:00 +0000 Subject: [PATCH 03/39] resvg: 0.34.1 -> 0.35.0 Diff: https://github.com/RazrFalcon/resvg/compare/v0.34.1...v0.35.0 Changelog: https://github.com/RazrFalcon/resvg/raw/v0.35.0/CHANGELOG.md --- pkgs/tools/graphics/resvg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix index d1cdcc3df49d..af86e9d46ba7 100644 --- a/pkgs/tools/graphics/resvg/default.nix +++ b/pkgs/tools/graphics/resvg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.34.1"; + version = "0.35.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - hash = "sha256-4sjjd2IKca4NBTCTxhdqdxuzjEMKc85ckRNrNSjhUnE="; + hash = "sha256-iZY0t8GssM4doPnPiI+FdAdjmfXDxSUT7K9YUHBs8rQ="; }; - cargoHash = "sha256-PEJjtrsQF4h9rCP1DFFP5EFjW/6ZMgdMCawIc9cW76s="; + cargoHash = "sha256-F7XeBto+vqfhucG7fygRkQWTQe7iwUuVyPTzdyXI7Lc="; cargoBuildFlags = [ "--package=resvg" From 238e2c8052cef7d6316f08738b5feeb46e761d60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 22:45:51 +0000 Subject: [PATCH 04/39] mob: 4.4.3 -> 4.4.5 --- pkgs/applications/misc/mob/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index c54aa5e1dd7c..74ab67739d02 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "mob"; - version = "4.4.3"; + version = "4.4.5"; src = fetchFromGitHub { owner = "remotemobprogramming"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XWXoY/e/xceO3sOGvA2hrdvbdb8nomMg7AGUW090I74="; + sha256 = "sha256-/Kr5K0QkjARWKR8YhDsOQ2CoUzUu5LWUq6smhB0yDCM="; }; vendorHash = null; From 5ab7121e8c2d3776791991c29f891e589bdbe3e2 Mon Sep 17 00:00:00 2001 From: Ivan Petkov Date: Tue, 27 Jun 2023 15:48:12 -0700 Subject: [PATCH 05/39] wasm-pack: 0.12.0 -> 0.12.1 --- pkgs/development/tools/wasm-pack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix index 770a1232196a..d805b529d678 100644 --- a/pkgs/development/tools/wasm-pack/default.nix +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "wasm-pack"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "rustwasm"; repo = "wasm-pack"; rev = "refs/tags/v${version}"; - hash = "sha256-Sfcf/Dko2lAfkfYdeanLAqhbUgeKtGBxx4timZi2kCk="; + hash = "sha256-L4mCgUPG4cgTUpCoaIUOTONBOggXn5vMyPKj48B3MMk="; }; - cargoHash = "sha256-bl1KDFNvpNtkbKqiBRbmQLo1/oqLl7u7gNHLhhm8ETI="; + cargoHash = "sha256-mqQRQXaUW6mreE7UUEA0zhhaaGGKLRUngH9QLxcaIdY="; buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; From dcd6f79da7a3d38c7e0db4ca1169c12f1f8cea9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 27 Jun 2023 20:16:23 -0300 Subject: [PATCH 06/39] Revert "ibm-plex: 6.2.0 -> 6.3.0" This reverts commit b6ae54346690ba76902db44f124e6eda75e8ed89. The source files for versions 6.2.0 and 6.3.0 have the same content. --- pkgs/data/fonts/ibm-plex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix index 72aac21ea694..21321d83af34 100644 --- a/pkgs/data/fonts/ibm-plex/default.nix +++ b/pkgs/data/fonts/ibm-plex/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "ibm-plex"; - version = "6.3.0"; + version = "6.2.0"; src = fetchzip { url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip"; - hash = "sha256-VwJyZMH10FXDxc7T7m8sl7raUlrarSM0Snjruo1ICHU="; + hash = "sha256-RvD/aeZrvltJiuAHqYMNaRsjLgTdcC1/5zqlcd4qKAA="; }; installPhase = '' From ba8a044343da4af1fcdfedb218ebdb3aed0ca8b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 23:34:08 +0000 Subject: [PATCH 07/39] python310Packages.pyside2: 5.15.5 -> 5.15.10 --- pkgs/development/python-modules/pyside2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index 4fa3e757767d..151efb65895e 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -17,11 +17,11 @@ disabledIf (pythonAtLeast "3.11") ( stdenv.mkDerivation rec { pname = "pyside2"; - version = "5.15.5"; + version = "5.15.10"; src = fetchurl { url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz"; - sha256 = "0cwvw6695215498rsbm2xzkwaxdr3w7zfvy4kc62c01k6pxs881r"; + sha256 = "sha256-KvaR02E6Qfg6YEObRlaPwsaW2/rkL3zXsHFS0RXq0zo="; }; patches = [ From 413284d329cea187e4e7f54465a9dba75704bb00 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Jun 2023 00:25:52 +0000 Subject: [PATCH 08/39] checkstyle: 10.12.0 -> 10.12.1 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index d07b73f48fc2..63fd97439687 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "10.12.0"; + version = "10.12.1"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-pA1K58kBZ3lZVgzg0NFYt+vA1JHOW+yW41t0ARlqvJE="; + sha256 = "sha256-K6pQjcvofybGEtRz1sTVhP534SoJsChg2psngVMIyrY="; }; nativeBuildInputs = [ makeWrapper ]; From 653524cfe71db67df3f999e75a9ab8838db7f3d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Jun 2023 00:27:49 +0000 Subject: [PATCH 09/39] obs-studio-plugins.obs-vertical-canvas: 1.2.2 -> 1.2.4 --- .../video/obs-studio/plugins/obs-vertical-canvas.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix index a92acb29a90f..6c8ef3b67a4a 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-vertical-canvas"; - version = "1.2.2"; + version = "1.2.4"; src = fetchFromGitHub { owner = "Aitum"; repo = "obs-vertical-canvas"; rev = version; - sha256 = "sha256-9NXIJPF6ubd9M3t5pmSQvADoLmm+XolRhIvhbqw9R04="; + sha256 = "sha256-a9r01adzeC8KSr+ATgRQLoJ+dlAj6NWFZ5cRYlS7FeM="; }; nativeBuildInputs = [ cmake ]; From e169d121d635fc2f06300081b8300a8397331749 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Wed, 28 Jun 2023 01:44:20 +0200 Subject: [PATCH 10/39] paperless-ngx: add leona as maintainer --- pkgs/applications/office/paperless-ngx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 1993a2895e36..2f77951980f5 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -289,6 +289,6 @@ python.pkgs.buildPythonApplication rec { changelog = "https://github.com/paperless-ngx/paperless-ngx/releases/tag/v${version}"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ lukegb gador erikarvstedt ]; + maintainers = with maintainers; [ lukegb gador erikarvstedt leona ]; }; } From dd05e2a899699fb177b1b92d094783e7f8b4bd2f Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Wed, 28 Jun 2023 01:45:26 +0200 Subject: [PATCH 11/39] nixos/paperless: add leona as maintainer --- nixos/modules/services/misc/paperless.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 4199e7713304..7d371c605289 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -91,7 +91,7 @@ let }; in { - meta.maintainers = with maintainers; [ erikarvstedt Flakebi ]; + meta.maintainers = with maintainers; [ erikarvstedt Flakebi leona ]; imports = [ (mkRenamedOptionModule [ "services" "paperless-ng" ] [ "services" "paperless" ]) From be39aba786cdc1d4dc3ad8b89fe8e6480d1d061a Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 28 Jun 2023 09:11:04 +0800 Subject: [PATCH 12/39] nushell: 0.81.0 -> 0.82.0 --- pkgs/shells/nushell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index f13307113db5..e867f9e48662 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage ( let - version = "0.81.0"; + version = "0.82.0"; pname = "nushell"; in { inherit version pname; @@ -33,10 +33,10 @@ rustPlatform.buildRustPackage ( owner = pname; repo = pname; rev = version; - hash = "sha256-Hcr4mSx5qSMNe7/UTR6iXV3IyTBiRgfWS7vYf3FIxQA="; + hash = "sha256-D/R+/60Lo2rLUA/313CTJQookqSNtbD7LnVf0vBC9Qc="; }; - cargoHash = "sha256-Xa8mQVz3uOw212aLlRfM4GmA0vjjt/5SjQ5biOLcqEc="; + cargoHash = "sha256-LTnBJDA2RkAP3ZCpl5enUc0PLS63EVXQyIopUwBd8OQ="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] From cbfcf6ed61a40dbeeec66bd0c9b4891427417506 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 28 Jun 2023 09:11:25 +0800 Subject: [PATCH 13/39] nushellPlugins.query: 0.81.0 -> 0.82.0 --- pkgs/shells/nushell/plugins/query.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index fb0d7ec84e95..d14f5f21d803 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -9,11 +9,11 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; - version = "0.81.0"; + version = "0.82.0"; src = nushell.src; - cargoHash = "sha256-iQ7xr7NY/OQ5pVq2DFmdl/6F2NlUh3NBA9dk+e4gzRE="; + cargoHash = "sha256-j0FI6Ed8YVIpJ4MBDl6h9qfnolMlPJeoY0Q/qfbGTBA="; buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; From 85af4932d40f9192ea26987b505e317f88db8e5c Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 28 Jun 2023 09:11:45 +0800 Subject: [PATCH 14/39] nushellFull: init at 0.82.0 --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f03e41d08c22..fa921d6e356e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27612,6 +27612,8 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AppKit Security; }; + nushellFull = nushell.override { additionalFeatures = p: p ++ ["dataframe" "extra"]; }; + nu_scripts = callPackage ../shells/nushell/nu_scripts { }; nushellPlugins = callPackage ../shells/nushell/plugins { From 3adc3587e8e8ecbe90153e7ad4e7b3b60b592289 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 Jun 2023 00:46:06 +0200 Subject: [PATCH 15/39] tts: 0.14.0 -> 0.14.3 https://github.com/coqui-ai/TTS/releases/tag/v0.14.1 https://github.com/coqui-ai/TTS/releases/tag/v0.14.2 https://github.com/coqui-ai/TTS/releases/tag/v0.14.3 --- pkgs/tools/audio/tts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index e0eecc958a8f..d4e5a68fa094 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -15,14 +15,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.14.0"; + version = "0.14.3"; format = "pyproject"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "refs/tags/v${version}"; - hash = "sha256-AVU4ULz++t9850pYeNrG5HKNvUZcMld4O1/zu697rzk="; + hash = "sha256-4LojjH6ft9RfftBBFNWmC2pl/YXfgZCXhkZFsELTgCE="; }; postPatch = let From fc6c2bb4d242f07f3d94657f2bfd2f14bae1188b Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Wed, 28 Jun 2023 11:35:29 +1000 Subject: [PATCH 16/39] whereami: fix darwin dylib name --- pkgs/development/libraries/whereami/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/whereami/default.nix b/pkgs/development/libraries/whereami/default.nix index 8bda2ef46dcf..26908d2b1084 100644 --- a/pkgs/development/libraries/whereami/default.nix +++ b/pkgs/development/libraries/whereami/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fixDarwinDylibNames }: let libExt = stdenv.hostPlatform.extensions.sharedLibrary; @@ -16,6 +17,8 @@ stdenv.mkDerivation rec { sha256 = "XhRqW0wdXzlmyBf1cjqtQvztuyV4buxVl19Q0uyEOhk="; }; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + makeFlags = [ "-C_gnu-make" "build-library" From 453b11ce4f1d107d3f7b3a75f4746395c659d42b Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 01:53:39 +0000 Subject: [PATCH 17/39] coldsnap: correct license metadata https://github.com/awslabs/coldsnap/blob/v0.5.1/LICENSE --- pkgs/tools/admin/coldsnap/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/coldsnap/default.nix b/pkgs/tools/admin/coldsnap/default.nix index b9762f0b4b5e..93f9baa3de85 100644 --- a/pkgs/tools/admin/coldsnap/default.nix +++ b/pkgs/tools/admin/coldsnap/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/awslabs/coldsnap"; description = "A command line interface for Amazon EBS snapshots"; changelog = "https://github.com/awslabs/coldsnap/blob/${src.rev}/CHANGELOG.md"; - license = licenses.apsl20; + license = licenses.asl20; maintainers = teams.determinatesystems.members; }; } From 38c223f0f28689ed124ad1794cc0226eca312ab1 Mon Sep 17 00:00:00 2001 From: Jeffrey Lau Date: Wed, 28 Jun 2023 11:11:51 +0800 Subject: [PATCH 18/39] sexp: init at 0.8.6 (#239889) This is a dependency of the [next version](https://github.com/rnpgp/rnp/releases/tag/v0.17.0) of [rnp](https://github.com/NixOS/nixpkgs/blob/a04b45f10eddb02352574d95c7d0a76bfbfc11dc/pkgs/tools/security/rnp/default.nix#L17). --- pkgs/development/libraries/sexp/default.nix | 48 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/libraries/sexp/default.nix diff --git a/pkgs/development/libraries/sexp/default.nix b/pkgs/development/libraries/sexp/default.nix new file mode 100644 index 000000000000..9f9eb1f8973c --- /dev/null +++ b/pkgs/development/libraries/sexp/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, bzip2 +, cmake +, fetchFromGitHub +, gtest +, pkg-config +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "sexp"; + version = "0.8.6"; + + src = fetchFromGitHub { + owner = "rnpgp"; + repo = "sexp"; + rev = "v${finalAttrs.version}"; + hash = "sha256-NpDSoBxEM8g/SugLmT8E5+YZPDFIGHa4eXLjdzQxaiw="; + }; + + buildInputs = [ zlib bzip2 ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" + "-DBUILD_SHARED_LIBS=on" + "-DWITH_SEXP_TESTS=on" + "-DDOWNLOAD_GTEST=off" + "-DWITH_SEXP_CLI=on" + "-DWITH_SANITIZERS=off" + ]; + + nativeBuildInputs = [ cmake gtest pkg-config ]; + + outputs = [ "out" "lib" "dev" ]; + + preConfigure = '' + echo "v${finalAttrs.version}" > version.txt + ''; + + meta = with lib; { + homepage = "https://github.com/rnpgp/sexp"; + description = "S-expressions parser and generator C++ library, fully compliant to [https://people.csail.mit.edu/rivest/Sexp.txt]"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ ribose-jeffreylau ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5588cf6c88ab..8a20236eb045 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12453,6 +12453,8 @@ with pkgs; sewer = callPackage ../tools/admin/sewer { }; + sexp = callPackage ../development/libraries/sexp { }; + sfeed = callPackage ../tools/misc/sfeed { }; sftpman = callPackage ../tools/filesystems/sftpman { }; From 3ceb1a06493487280ca5a2d3fea2942591446e22 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 03:14:53 +0000 Subject: [PATCH 19/39] ArchiSteamFarm.ui: correct license metadata https://github.com/JustArchiNET/ASF-ui/blob/0dc9b31a571fe840ac1661b9e9777f253304529d/LICENSE --- pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 7d04f3bb9ef7..c04eb6811d0d 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -26,7 +26,7 @@ buildNpmPackage { meta = with lib; { description = "The official web interface for ASF"; - license = licenses.apsl20; + license = licenses.asl20; homepage = "https://github.com/JustArchiNET/ASF-ui"; inherit (ArchiSteamFarm.meta) maintainers platforms; }; From 4a48cc63b827abbabfca169e6a8fe95629a9b24c Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 03:15:58 +0000 Subject: [PATCH 20/39] nimPackages.tkrzw: correct license metadata https://git.sr.ht/~ehmry/nim-tkrzw/tree/20220922/item/src/tkrzw.nim#L1 --- pkgs/development/nim-packages/tkrzw/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/nim-packages/tkrzw/default.nix b/pkgs/development/nim-packages/tkrzw/default.nix index 15a76ae812a0..9f88067f988a 100644 --- a/pkgs/development/nim-packages/tkrzw/default.nix +++ b/pkgs/development/nim-packages/tkrzw/default.nix @@ -14,7 +14,7 @@ buildNimPackage rec { meta = with lib; src.meta // { description = "Nim wrappers over some of the Tkrzw C++ library"; - license = lib.licenses.apsl20; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ehmry ]; }; } From c711b865c9042d1426fb4767f47a448aaaa6ebe7 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 03:18:04 +0000 Subject: [PATCH 21/39] php.extensions.datadog_trace: correct license metadata https://github.com/DataDog/dd-trace-php/blob/0.82.0/LICENSE --- pkgs/development/php-packages/datadog_trace/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix index 8a9447525bba..5e00327af631 100644 --- a/pkgs/development/php-packages/datadog_trace/default.nix +++ b/pkgs/development/php-packages/datadog_trace/default.nix @@ -16,7 +16,7 @@ buildPecl rec { meta = with lib; { description = "Datadog Tracing PHP Client"; homepage = "https://github.com/DataDog/dd-trace-php"; - license = licenses.apsl20; + license = with licenses; [ asl20 /* or */ bsd3 ]; maintainers = teams.php.members; }; } From b52ad16283c16413bed5c82daca0d3bc37b89cef Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 03:19:12 +0000 Subject: [PATCH 22/39] python3Packages.readability-lxml: correct license metadata https://github.com/buriy/python-readability/blob/v0.8.1/LICENSE --- pkgs/development/python-modules/readability-lxml/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/readability-lxml/default.nix b/pkgs/development/python-modules/readability-lxml/default.nix index 8f0006a3c0ce..cca38cd71ae5 100644 --- a/pkgs/development/python-modules/readability-lxml/default.nix +++ b/pkgs/development/python-modules/readability-lxml/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { broken = stdenv.isDarwin; description = "Fast python port of arc90's readability tool"; homepage = "https://github.com/buriy/python-readability"; - license = licenses.apsl20; + license = licenses.asl20; maintainers = with maintainers; [ siraben ]; }; } From 4e53e0c4a63b8c466e374f42a7b7c907813de3bd Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 03:20:40 +0000 Subject: [PATCH 23/39] python3Packages.yacs: correct license metadata https://github.com/rbgirshick/yacs/blob/v0.1.8/LICENSE --- pkgs/development/python-modules/yacs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/yacs/default.nix b/pkgs/development/python-modules/yacs/default.nix index a105a18b2f65..e5712b240f8c 100644 --- a/pkgs/development/python-modules/yacs/default.nix +++ b/pkgs/development/python-modules/yacs/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Yet Another Configuration System"; homepage = "https://github.com/rbgirshick/yacs"; - license = licenses.apsl20; + license = licenses.asl20; maintainers = with maintainers; [ lucasew ]; }; } From 2632659691b00e66d383ed502a29f269d15db4b5 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 03:22:50 +0000 Subject: [PATCH 24/39] check-jsonschema: correct license metadata https://github.com/python-jsonschema/check-jsonschema/blob/0.21.0/LICENSE --- pkgs/development/tools/check-jsonschema/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/check-jsonschema/default.nix b/pkgs/development/tools/check-jsonschema/default.nix index 7c55194bc857..868889648486 100644 --- a/pkgs/development/tools/check-jsonschema/default.nix +++ b/pkgs/development/tools/check-jsonschema/default.nix @@ -48,7 +48,7 @@ buildPythonApplication rec { description = "A jsonschema CLI and pre-commit hook"; homepage = "https://github.com/python-jsonschema/check-jsonschema"; changelog = "https://github.com/python-jsonschema/check-jsonschema/blob/${version}/CHANGELOG.rst"; - license = licenses.apsl20; + license = licenses.asl20; maintainers = with maintainers; [ sudosubin ]; }; } From 9fe79a86b45f305bf705847a3860e83e46913c49 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 03:26:38 +0000 Subject: [PATCH 25/39] libtapi: correct license metadata https://github.com/tpoechtrager/apple-libtapi/blob/664b8414f89612f2dfd35a9b679c345aa5389026/LICENSE.APPLE-LIBTAPI.txt https://github.com/apple-oss-distributions/tapi/blob/main/LICENSE.TXT --- pkgs/os-specific/darwin/libtapi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/libtapi/default.nix b/pkgs/os-specific/darwin/libtapi/default.nix index d109e0edcbd8..79c159e0635c 100644 --- a/pkgs/os-specific/darwin/libtapi/default.nix +++ b/pkgs/os-specific/darwin/libtapi/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Replaces the Mach-O Dynamic Library Stub files in Apple's SDKs to reduce the size"; homepage = "https://github.com/tpoechtrager/apple-libtapi"; - license = licenses.apsl20; + license = licenses.ncsa; maintainers = with maintainers; [ matthewbauer ]; }; } From 8e669c6d1a87ef606d207425be2b4052bcde0095 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 03:30:32 +0000 Subject: [PATCH 26/39] utm: correct license metadata https://github.com/utmapp/UTM/blob/v4.2.5/LICENSE --- pkgs/os-specific/darwin/utm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/utm/default.nix b/pkgs/os-specific/darwin/utm/default.nix index d763414f97c0..2a9879085b0c 100644 --- a/pkgs/os-specific/darwin/utm/default.nix +++ b/pkgs/os-specific/darwin/utm/default.nix @@ -59,7 +59,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://mac.getutm.app/"; changelog = "https://github.com/utmapp/${pname}/releases/tag/v${version}"; mainProgram = "UTM"; - license = licenses.apsl20; + license = licenses.asl20; platforms = platforms.darwin; # 11.3 is the minimum supported version as of UTM 4. sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ rrbutani ]; From 6e70ee63ea7a200f6915c1018a56465fc5f51541 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 03:32:09 +0000 Subject: [PATCH 27/39] keycloak.plugins.keycloak-discord: correct license metadata https://github.com/wadahiro/keycloak-discord/blob/v0.3.1/ejb/src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java --- pkgs/servers/keycloak/keycloak-discord/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/keycloak/keycloak-discord/default.nix b/pkgs/servers/keycloak/keycloak-discord/default.nix index 047bc67fbc56..0605145ff96f 100644 --- a/pkgs/servers/keycloak/keycloak-discord/default.nix +++ b/pkgs/servers/keycloak/keycloak-discord/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/wadahiro/keycloak-discord"; description = "Keycloak Social Login extension for Discord"; - license = licenses.apsl20; + license = licenses.asl20; maintainers = with maintainers; [ mkg20001 ]; }; } From 2b989aea94e251c7d825822f83c460fb5051cd60 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 03:33:22 +0000 Subject: [PATCH 28/39] keycloak-metrics-spi: correct license metadata https://github.com/aerogear/keycloak-metrics-spi/blob/3.0.0/LICENSE --- pkgs/servers/keycloak/keycloak-metrics-spi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix index e8d917fea3bd..28eaec2d5f65 100644 --- a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix +++ b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/aerogear/keycloak-metrics-spi"; description = "Keycloak Service Provider that adds a metrics endpoint"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.apsl20; + license = licenses.asl20; maintainers = with maintainers; [ benley ]; }; } From a0d6f51e9861059c67f48fbaffc5044c81824da7 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 28 Jun 2023 03:36:26 +0000 Subject: [PATCH 29/39] zrok: correct license metadata https://github.com/openziti/zrok/blob/v0.3.6/LICENSE --- pkgs/tools/networking/zrok/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/tools/networking/zrok/default.nix index 96c4bd89f96d..e76d05c1af13 100644 --- a/pkgs/tools/networking/zrok/default.nix +++ b/pkgs/tools/networking/zrok/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bandresen ]; platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.apsl20; + license = lib.licenses.asl20; }; } From 65d1a806c7f2ece8d886d81be4401129a9f5269d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 28 Jun 2023 04:20:00 +0000 Subject: [PATCH 30/39] checkstyle: use stdenvNoCC --- pkgs/development/tools/analysis/checkstyle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 63fd97439687..9a4f6cdbf376 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre }: +{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { version = "10.12.1"; pname = "checkstyle"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-K6pQjcvofybGEtRz1sTVhP534SoJsChg2psngVMIyrY="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; buildInputs = [ jre ]; dontUnpack = true; From 44f0e53157afda60812bdd2f78c968bc55ec8592 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 28 Jun 2023 04:20:00 +0000 Subject: [PATCH 31/39] checkstyle: update meta --- pkgs/development/tools/analysis/checkstyle/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 9a4f6cdbf376..82394980fcf6 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -29,7 +29,8 @@ stdenvNoCC.mkDerivation rec { adheres to a coding standard. By default it supports the Sun Code Conventions, but is highly configurable. ''; - homepage = "http://checkstyle.sourceforge.net/"; + homepage = "https://checkstyle.org/"; + changelog = "https://checkstyle.org/releasenotes.html#Release_${version}"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl21; maintainers = with maintainers; [ pSub ]; From 0e1573d9dc9ce1b28f55a0ce5697496e2cb20dfe Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 28 Jun 2023 03:16:20 +0000 Subject: [PATCH 32/39] terraform-providers.buildkite: 0.19.1 -> 0.19.2 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c3ad7f546551..7a1fdbf01e36 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -182,13 +182,13 @@ "vendorHash": "sha256-jOscYbwZ8m4smGiAy2vNhPMTAUnINkpuVRQ8E6LpWVw=" }, "buildkite": { - "hash": "sha256-QXhuT/EOqaxBCFGh49JIkrX8SoiSIZEyNzR5RDJldyo=", + "hash": "sha256-yxL08Eysj/w9uLmuqDKx1ZcYQZSy91pDgR84BdpsF88=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v0.19.1", + "rev": "v0.19.2", "spdx": "MIT", - "vendorHash": "sha256-cWENIMdkg7+h0sIci+W6A9pxhfQ5/wvWbKx5D4S5Nw0=" + "vendorHash": "sha256-AJcPxiuglHpsHUIa5sJMtY7MRN5JrW/tfkz3+5Bv9AU=" }, "checkly": { "hash": "sha256-ZJQdH1ot/ygnM4Q2rihzHFH67ge6zfVrPASgV0lUs34=", From 482787e829611d602563e036c62ab45382bb0ade Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 28 Jun 2023 03:16:38 +0000 Subject: [PATCH 33/39] terraform-providers.cloudflare: 4.8.0 -> 4.9.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7a1fdbf01e36..56edc95a43bd 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -218,13 +218,13 @@ "vendorHash": "sha256-qIgr+ynaNSfNx1iW5RJrNHvEnlr46dBzIi+5IXYn+3Q=" }, "cloudflare": { - "hash": "sha256-bunkrh9m7w47704G8Pq6S7bmhhcVIVP1yk+/AGG28Wg=", + "hash": "sha256-/sTKLSoExqssC2pi3LHva8uRolZl+kBDmm8bNNW5+Es=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.8.0", + "rev": "v4.9.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-xqVaZj0NEtcT64TThkFh2AJ03wiXCAhgYSddaUBlGAc=" + "vendorHash": "sha256-bY5CXHEEYmJ3IoA+byc8sQMNVpUq+6efY/WolIRXdxU=" }, "cloudfoundry": { "hash": "sha256-SFA0rG80BWaJHwvAWEugdVd3nR+YGflyYONOuoS++P8=", From 14006e34586db8d3369ad60e9c1cc8d0ec464f8c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 28 Jun 2023 03:25:09 +0000 Subject: [PATCH 34/39] terraform-providers.google: 4.70.0 -> 4.71.0 --- .../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 56edc95a43bd..f76d38cac7f7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -445,12 +445,12 @@ "vendorHash": "sha256-XgGNz+yP+spRA2+qFxwiZFcBRv2GQWhiYY9zoC8rZPc=" }, "google": { - "hash": "sha256-a0ReG2hwsPG6h93df+yRrhFSNXv0EOsxoSU7B+S90jA=", + "hash": "sha256-euQ320XxCby8dhDFuxqR0EGw963WIcGtGK+MpNW0eM0=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.70.0", + "rev": "v4.71.0", "spdx": "MPL-2.0", "vendorHash": "sha256-0ZCyJiFzfWvmV+dNNUWKopdEHreXyjRFpaCA8BWil3k=" }, From b0045e784adb58f50648beb8b4f1e9b1ea8daf26 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 28 Jun 2023 03:25:36 +0000 Subject: [PATCH 35/39] terraform-providers.google-beta: 4.70.0 -> 4.71.0 --- .../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 f76d38cac7f7..9d1f5b01efc0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -455,12 +455,12 @@ "vendorHash": "sha256-0ZCyJiFzfWvmV+dNNUWKopdEHreXyjRFpaCA8BWil3k=" }, "google-beta": { - "hash": "sha256-p8RnKNSa5qugzNUlYmoMy+m/Gy0m3yO+GLfDwALduvM=", + "hash": "sha256-DFghnLTeQzDw3QQdGQXWBsgBjsBQxph7Kgsc/TQTvLg=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.70.0", + "rev": "v4.71.0", "spdx": "MPL-2.0", "vendorHash": "sha256-0ZCyJiFzfWvmV+dNNUWKopdEHreXyjRFpaCA8BWil3k=" }, From d24391351b3e6b28d2c1577f1780d28bbc45d2ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Jun 2023 04:39:08 +0000 Subject: [PATCH 36/39] vtm: 0.9.9n -> 0.9.9o --- pkgs/tools/misc/vtm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index 9e4df46f6663..50927e5b0418 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.9.9n"; + version = "0.9.9o"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-THsIA8+yfMXM+WLVL8TCnD1CEZy1iB4hA7SzhdVT4hA="; + sha256 = "sha256-uQnGMADTcDXsjUZR/q7RbPEMGyK3Bh9KyL6L/a47Q5I="; }; nativeBuildInputs = [ cmake ]; From a6ed52ecf6b632c0c7f44218e829bc59678ba2fb Mon Sep 17 00:00:00 2001 From: Danil Suetin Date: Wed, 28 Jun 2023 05:51:10 +0000 Subject: [PATCH 37/39] Update maintainers info (#240196) --- maintainers/maintainer-list.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b8ff798f2f3d..eb5d8f54ec96 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4366,12 +4366,12 @@ }; dsuetin = { name = "Danil Suetin"; - email = "suetin085@gmail.com"; + email = "suetin085+nixpkgs@protonmail.com"; matrix = "@dani0854:matrix.org"; github = "dani0854"; githubId = 32674935; keys = [{ - fingerprint = "6CC2 D713 6703 0D86 CA29 C71F 23B5 AA6F A374 F2FE"; + fingerprint = "E033 FE26 0E62 224B B35C 75C9 DE8B 9CED 0696 C600"; }]; }; dsymbol = { From 98d4b5dda1e9df2ec8ea560bf0d00414fb5bdf7c Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Wed, 28 Jun 2023 07:51:36 +0200 Subject: [PATCH 38/39] got: 0.89 -> 0.90 (#240188) --- pkgs/applications/version-management/got/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index b6f964ea24d3..59d04d081fe0 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.89"; + version = "0.90"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - hash = "sha256-J0BJMsB3E0ABJMFeMYQXOFQRt6H+fuU05I8rnk8JbYw="; + hash = "sha256-2jU/Q6W5G1Y/HZvksr21D93//HCwpLd3+l3RFGKb94M="; }; nativeBuildInputs = [ pkg-config bison ] From 6d03fd9453cb517faa5c43870e1b5e5ea237f64d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 28 Jun 2023 08:52:53 +0300 Subject: [PATCH 39/39] jfbpdf, jfbview: drop (#240122) --- pkgs/os-specific/linux/jfbview/default.nix | 73 ---------------------- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 7 --- 3 files changed, 2 insertions(+), 80 deletions(-) delete mode 100644 pkgs/os-specific/linux/jfbview/default.nix diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix deleted file mode 100644 index eb61ff9d5130..000000000000 --- a/pkgs/os-specific/linux/jfbview/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, freetype, harfbuzz, jbig2dec, libjpeg, libX11, mupdf_1_17, ncurses, openjpeg -, openssl - -, imageSupport ? true, imlib2 ? null }: - -let - package = if imageSupport - then "jfbview" - else "jfbpdf"; - binaries = if imageSupport - then [ "jfbview" "jpdfcat" "jpdfgrep" ] # all require imlib2 - else [ "jfbpdf" ]; # does not -in - -stdenv.mkDerivation rec { - pname = package; - version = "0.5.7"; - - src = fetchFromGitHub { - repo = "JFBView"; - owner = "jichu4n"; - rev = version; - sha256 = "0ppns49hnmp04zdjw6wc28v0yvz31rkzvd5ylcj7arikx20llpxf"; - }; - - postPatch = '' - substituteInPlace main.cpp \ - --replace "" "" - ''; - - hardeningDisable = [ "format" ]; - - buildInputs = [ - freetype harfbuzz jbig2dec libjpeg libX11 mupdf_1_17 ncurses openjpeg - openssl - ] ++ lib.optionals imageSupport [ - imlib2 - ]; - - configurePhase = '' - # Hack. Probing (`ldconfig -p`) fails with ‘cannot execute binary file’. - # Overriding `OPENJP2 =` later works, but makes build output misleading: - substituteInPlace Makefile --replace "ldconfig -p" "echo libopenjp2" - - make config.mk - ''; - - buildFlags = binaries; - enableParallelBuilding = true; - - installPhase = '' - mkdir -p $out/bin - install ${toString binaries} $out/bin - ''; - - meta = with lib; { - description = "PDF and image viewer for the Linux framebuffer"; - longDescription = '' - A very fast PDF and image viewer for the Linux framebuffer with some - advanced and unique features, including: - - Reads PDFs (MuPDF) and common image formats (Imlib2) - - Supports arbitrary zoom (10% - 1000%) and rotation - - Table of Contents (TOC) viewer for PDF documents - - Multi-threaded rendering on multi-core machines - - Asynchronous background rendering of the next page - - Customizable multi-threaded caching - ''; - homepage = "https://seasonofcode.com/pages/jfbview.html"; - license = licenses.asl20; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3969dc57923d..4c31867174f6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -768,6 +768,8 @@ mapAliases ({ jbuilder = throw "'jbuilder' has been renamed to/replaced by 'dune_1'"; # Converted to throw 2022-02-22 jd = throw "jd has been dropped due to the lack of maintenance from upstream since 2016"; # Added 2022-06-03 jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version"; # Added 2021-04-26 + jfbpdf = throw "'jfbpdf' has been removed, because it depends on an outdated and insecure version of mupdf"; # Added 2023-06-27 + jfbview = throw "'jfbview' has been removed, because it depends on an outdated and insecure version of mupdf"; # Added 2023-06-27 jira-cli = throw "jira-cli was removed because it is no longer maintained"; # Added 2023-02-28 joseki = throw "'joseki' has been renamed to/replaced by 'apache-jena-fuseki'"; # Converted to throw 2022-02-22 journalbeat = throw "journalbeat7 has been removed upstream. Use filebeat with the journald input instead"; # Added 2022-10-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a20236eb045..934ce3c8e2f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27264,13 +27264,6 @@ with pkgs; iwd = callPackage ../os-specific/linux/iwd { }; - jfbview = callPackage ../os-specific/linux/jfbview { - imlib2 = imlib2Full; - }; - jfbpdf = jfbview.override { - imageSupport = false; - }; - jool-cli = callPackage ../os-specific/linux/jool/cli.nix { }; juju = callPackage ../applications/networking/juju { };