From 131c14aaf2f481b62fc8ca695b9b707f30c96147 Mon Sep 17 00:00:00 2001 From: Patrizio Bekerle Date: Fri, 16 Jun 2023 19:09:52 +0200 Subject: [PATCH 01/19] qownnotes: 23.6.4 -> 23.6.5 --- pkgs/applications/office/qownnotes/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index f3ce1d58e6c5..4ca0f4bdecd9 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -13,19 +13,20 @@ , wrapQtAppsHook , botan2 , pkg-config +, nixosTests }: let pname = "qownnotes"; appname = "QOwnNotes"; - version = "23.6.4"; + version = "23.6.5"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; - hash = "sha256-4uH76/zLgNcuX6nI6YtTxGB9cYj3jHla/B3w9w6CUx4="; + hash = "sha256-FTGptp6RWVJYdLXtDI5cymt1bNr+0yHk0wLCOuTbxlE="; }; nativeBuildInputs = [ @@ -60,6 +61,9 @@ stdenv.mkDerivation { makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/${pname} ''; + # Tests QOwnNotes using the NixOS module by launching xterm: + passthru.tests.basic-nixos-module-functionality = nixosTests.qownnotes; + meta = with lib; { description = "Plain-text file notepad and todo-list manager with markdown support and Nextcloud/ownCloud integration"; homepage = "https://www.qownnotes.org/"; From 35bbed3c60ebc122f0ee86694a6d65bc66af6a06 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 17 Jun 2023 04:20:00 +0000 Subject: [PATCH 02/19] gallery-dl: 1.25.5 -> 1.25.6 Changelog: https://github.com/mikf/gallery-dl/blob/v1.25.6/CHANGELOG.md --- pkgs/applications/misc/gallery-dl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index f0e5994a23c7..d7450d59d99d 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.25.5"; + version = "1.25.6"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - sha256 = "sha256-IFzKVHIuZZ2WLk23ZqyxvwxXF45f2O/VAqQ/j98x4ag="; + sha256 = "sha256-CCTO/1t6lIK2nQKtqgWq0HAm760t5tOhg8v99zUkY/U="; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonApplication rec { meta = with lib; { description = "Command-line program to download image-galleries and -collections from several image hosting sites"; homepage = "https://github.com/mikf/gallery-dl"; - changelog = "https://github.com/mikf/gallery-dl/raw/v${version}/CHANGELOG.md"; + changelog = "https://github.com/mikf/gallery-dl/blob/v${version}/CHANGELOG.md"; license = licenses.gpl2Only; maintainers = with maintainers; [ dawidsowa marsam ]; }; From c9730168e86daa4e3de7de4e7d2b5313ebe870ac Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sat, 17 Jun 2023 17:07:42 +1000 Subject: [PATCH 03/19] python3Packages.howdoi: 2.0.19 -> 2.0.20 enable more tests, unmark broken on aarch64-linux --- .../python-modules/howdoi/default.nix | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index 7a4d32374b44..9a08dafca986 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -3,6 +3,7 @@ , appdirs , buildPythonPackage , cachelib +, colorama , cssselect , fetchFromGitHub , keep @@ -10,13 +11,14 @@ , pygments , pyquery , requests +, rich , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "howdoi"; - version = "2.0.19"; + version = "2.0.20"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,18 +27,20 @@ buildPythonPackage rec { owner = "gleitz"; repo = pname; rev = "v${version}"; - hash = "sha256-uLAc6E8+8uPpo070vsG6Od/855N3gTQMf5pSUvtlh0I="; + hash = "sha256-u0k+h7Sp2t/JUnfPqRzDpEA+vNXB7CpyZ/SRvk+B9t0="; }; propagatedBuildInputs = [ appdirs cachelib + colorama cssselect keep lxml pygments pyquery requests + rich ]; nativeCheckInputs = [ @@ -48,20 +52,7 @@ buildPythonPackage rec { ''; disabledTests = [ - # AssertionError: "The... - "test_get_text_with_one_link" - "test_get_text_without_links" - # Those tests are failing in the sandbox - # OSError: [Errno 24] Too many open files - "test_answers" - "test_answers_bing" "test_colorize" - "test_json_output" - "test_missing_pre_or_code_query" - "test_multiple_answers" - "test_position" - "test_unicode_answer" - "test_answer_links_using_l_option" ]; pythonImportsCheck = [ @@ -69,7 +60,8 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isDarwin; + changelog = "https://github.com/gleitz/howdoi/blob/v${version}/CHANGES.txt"; description = "Instant coding answers via the command line"; homepage = "https://github.com/gleitz/howdoi"; license = licenses.mit; From 5ff5b2ae4cea8fa54fe14ad38e3bad1c7a226d63 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 17 Jun 2023 09:52:05 +0200 Subject: [PATCH 04/19] tsm-client: 8.1.17.2 -> 8.1.19.0 "Update History" (release notes): https://www.ibm.com/support/pages/node/6998343 With this release, IBM renamed the product from "IBM Spectrum Protect" to "IBM Storage Protect": https://www.ibm.com/support/pages/node/6964770 However, URLs apparently haven't been changed (yet). --- pkgs/tools/backup/tsm-client/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/backup/tsm-client/default.nix b/pkgs/tools/backup/tsm-client/default.nix index 80097ade0902..66829d3ab048 100644 --- a/pkgs/tools/backup/tsm-client/default.nix +++ b/pkgs/tools/backup/tsm-client/default.nix @@ -72,9 +72,9 @@ let sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.yarny ]; - description = "IBM Spectrum Protect (Tivoli Storage Manager) CLI and API"; + description = "IBM Storage Protect (Tivoli Storage Manager) CLI and API"; longDescription = '' - IBM Spectrum Protect (Tivoli Storage Manager) provides + IBM Storage Protect (Tivoli Storage Manager) provides a single point of control for backup and recovery. This package contains the client software, that is, a command line client and linkable libraries. @@ -104,10 +104,10 @@ let unwrapped = stdenv.mkDerivation rec { name = "tsm-client-${version}-unwrapped"; - version = "8.1.17.2"; + version = "8.1.19.0"; src = fetchurl { url = mkSrcUrl version; - hash = "sha512-DZCXb3fZO2VYJJJUdjGt9TSdrYNhf8w7QMgEERzX8xb74jjA+UPNI2dbNCeja/vrgRYLYipWZPyjTQJmkxlM/g=="; + hash = "sha512-HF4w8R6R+7gfIFsYlO3R6mkDxMo4TvL/KeK7IuuspGLiajGnBU2B7yg9/oUiT11YUBHjklaINyceQWWJoFSQJw=="; }; inherit meta passthru; From cab8c7e9c909dbc01ceb9169e0787a5db5ea0997 Mon Sep 17 00:00:00 2001 From: meppu Date: Sat, 17 Jun 2023 13:00:45 +0300 Subject: [PATCH 05/19] gigalixir: 1.3.0 -> 1.6.0 --- pkgs/tools/misc/gigalixir/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/gigalixir/default.nix b/pkgs/tools/misc/gigalixir/default.nix index ba52fae855f2..916193f61ec0 100644 --- a/pkgs/tools/misc/gigalixir/default.nix +++ b/pkgs/tools/misc/gigalixir/default.nix @@ -7,12 +7,12 @@ python3.pkgs.buildPythonApplication rec { pname = "gigalixir"; - version = "1.3.0"; + version = "1.6.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-kNtybgv8j7t1tl6R5ZuC4vj5fnEcEenuNt0twA1kAh0="; + hash = "sha256-01CoCT++mGiwZ40vAjU3OFE74WGWlBuhaTwsNFIR1a0="; }; postPatch = '' @@ -42,6 +42,12 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ # Test requires network access "test_rollback_without_version" + # These following test's are now depraced and removed, check out these commits: + # https://github.com/gigalixir/gigalixir-cli/commit/00b758ed462ad8eff6ff0b16cd37fa71f75b2d7d + # https://github.com/gigalixir/gigalixir-cli/commit/76fa25f96e71fd75cc22e5439b4a8f9e9ec4e3e5 + "test_create_config" + "test_delete_free_database" + "test_get_free_databases" ]; pythonImportsCheck = [ From e0728c9db8d10010fc06d4adaf913ccbc1088f15 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Jun 2023 13:13:33 +0200 Subject: [PATCH 06/19] python311Packages.pysigma-backend-insightidr: 0.1.9 -> 0.2.1 Diff: https://github.com/SigmaHQ/pySigma-backend-insightidr/compare/refs/tags/v0.1.9...v0.2.1 --- .../python-modules/pysigma-backend-insightidr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix index 18b85d41939a..87612e80eb52 100644 --- a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-insightidr"; - version = "0.1.9"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-insightidr"; rev = "refs/tags/v${version}"; - hash = "sha256-/oHwWe8EcE1CS/hOmzJm9smfRLS/wShfbSGqOuvp8rU="; + hash = "sha256-0VBnbThEkGhpxkGNBop0rPYn0NujyrK+ei/2+2f3Wno="; }; nativeBuildInputs = [ From 784829aeda1a647717dbb85f050b2734e61c5b81 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Jun 2023 17:13:15 +0200 Subject: [PATCH 07/19] python310Packages.django-mysql: 4.9.0 -> 4.10.0 https://github.com/adamchainz/django-mysql/blob/4.10.0/docs/changelog.rst https://github.com/adamchainz/django-mysql/compare/refs/tags/4.9.0...4.10.0 --- pkgs/development/python-modules/django-mysql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-mysql/default.nix b/pkgs/development/python-modules/django-mysql/default.nix index 0a53c6489fe0..e05e59f2dab6 100644 --- a/pkgs/development/python-modules/django-mysql/default.nix +++ b/pkgs/development/python-modules/django-mysql/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "django-mysql"; - version = "4.9.0"; + version = "4.10.0"; format = "pyproject"; src = fetchFromGitHub { owner = "adamchainz"; repo = "django-mysql"; rev = "refs/tags/${version}"; - hash = "sha256-mXAdwNqSIrWMh+YcCjksiqmkLSXGAd+ofyzJmiG+gNo="; + hash = "sha256-5RmNYOY0m6BRD/3cENQLWPJ+dElR53oZaqk616kfQTA="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://django-mysql.readthedocs.io/en/latest/changelog.html"; + changelog = "https://github.com/adamchainz/django-mysql/blob/${version}/docs/changelog.rst"; description = "Extensions to Django for use with MySQL/MariaD"; homepage = "https://github.com/adamchainz/django-mysql"; license = licenses.mit; From c6990789ab9e0ecaa4b9f3f6469d090ec6e9f0c8 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 17 Jun 2023 22:19:27 +0400 Subject: [PATCH 08/19] =?UTF-8?q?simplotask:=201.7.0=20=E2=86=92=201.8.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/admin/simplotask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/simplotask/default.nix b/pkgs/tools/admin/simplotask/default.nix index b74af6d26266..08e7d0faea2a 100644 --- a/pkgs/tools/admin/simplotask/default.nix +++ b/pkgs/tools/admin/simplotask/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "simplotask"; - version = "1.7.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "umputun"; repo = "spot"; rev = "v${version}"; - hash = "sha256-aacG/s/zo4gMBsRug2i7vUyu1WUg3s+F8wtLsSVt7HQ="; + hash = "sha256-u2Nj8AgkqwocxQMcPszzLaUu9vrbAA/cKjEqqxnbnr8="; }; vendorHash = null; From 96c0ecaed56b5845e34dcd541f308fe5562492c8 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 7 Feb 2023 13:50:54 +0100 Subject: [PATCH 09/19] curv: init at 0.5 --- pkgs/applications/graphics/curv/default.nix | 68 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/applications/graphics/curv/default.nix diff --git a/pkgs/applications/graphics/curv/default.nix b/pkgs/applications/graphics/curv/default.nix new file mode 100644 index 000000000000..6725e525c376 --- /dev/null +++ b/pkgs/applications/graphics/curv/default.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, boost +, eigen +, glm +, libGL +, libpng +, openexr +, tbb +, xorg +, ilmbase +, llvmPackages +}: + +stdenv.mkDerivation rec { + pname = "curv"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "curv3d"; + repo = "curv"; + rev = "refs/tags/${version}"; + hash = "sha256-m4p5uxRk6kEJUilmbQ1zJcQDRvRCV7pkxnqupZJxyjo="; + fetchSubmodules = true; + }; + + strictDeps = true; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + boost + eigen + glm + libGL + libpng + openexr + tbb + xorg.libX11 + xorg.libXcursor + xorg.libXext + xorg.libXi + xorg.libXinerama + xorg.libXrandr + ] ++ lib.optionals stdenv.isDarwin [ + ilmbase + llvmPackages.openmp + ]; + + # GPU tests do not work in sandbox, instead we do this for sanity + checkPhase = '' + runHook preCheck + test "$($out/bin/curv -x 2 + 2)" -eq "4" + runHook postCheck + ''; + + meta = with lib; { + description = "A 2D and 3D geometric modelling programming language for creating art with maths"; + homepage = "https://github.com/curv3d/curv"; + license = licenses.asl20; + platforms = platforms.all; + broken = stdenv.isDarwin; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26e76899a0df..0536656315f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6803,6 +6803,8 @@ with pkgs; trurl = callPackage ../tools/networking/trurl { }; + curv = callPackage ../applications/graphics/curv { }; + cunit = callPackage ../tools/misc/cunit { }; bcunit = callPackage ../tools/misc/bcunit { }; From 3ea5e8337304e65b77f0d56ca872ddac6516b970 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 17 Jun 2023 22:49:06 +0300 Subject: [PATCH 10/19] writers.makePythonWriter: fix interpreter executable --- pkgs/build-support/writers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 2c26f350fbd7..3016a45b8a0f 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -264,8 +264,8 @@ let makeScriptWriter { interpreter = if libraries == [] - then "${python}/bin/python" - else "${python.withPackages (ps: libraries)}/bin/python" + then python.interpreter + else (python.withPackages (ps: libraries)).interpreter ; check = optionalString python.isPy3k (writeDash "pythoncheck.sh" '' exec ${buildPythonPackages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1" From 287960743168ac2984d524cc8ae9986950130154 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 17 Jun 2023 23:45:11 +0300 Subject: [PATCH 11/19] tests.stdenv.hooks.reproducible-builds: fix mistake --- pkgs/test/stdenv/hooks.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/test/stdenv/hooks.nix b/pkgs/test/stdenv/hooks.nix index ba5da511c6fe..eb1b3f61bda6 100644 --- a/pkgs/test/stdenv/hooks.nix +++ b/pkgs/test/stdenv/hooks.nix @@ -115,7 +115,7 @@ name = "test-reproducible-builds"; buildCommand = '' # can't be tested more precisely because the value of random-seed changes depending on the output - [[ $env.NIX_CFLAGS_COMPILE =~ "-frandom-seed=" ]] + [[ $NIX_CFLAGS_COMPILE =~ "-frandom-seed=" ]] touch $out ''; }; From 825ff053e148e825737f35e5d3ffa5a4ea67cfe4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Jun 2023 23:08:26 +0000 Subject: [PATCH 12/19] hydroxide: 0.2.26 -> 0.2.27 --- pkgs/applications/networking/hydroxide/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index 73b4da770809..994e17c750c8 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/pkgs/applications/networking/hydroxide/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hydroxide"; - version = "0.2.26"; + version = "0.2.27"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UCS49P83dGTD/Wx95Mslstm2C6hKgJB/1tJTZmmwLDg="; + sha256 = "sha256-APRa+wZhls7O2q3zVPEB9Kegd1YspcfC8PSJy6KFlR8="; }; vendorHash = "sha256-OLsJc/AMtD03KA8SN5rsnaq57/cB7bMB/f7FfEjErEU="; From 6d624801d89bea751222052a66767952fe07de74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Jun 2023 00:04:39 +0000 Subject: [PATCH 13/19] python310Packages.somajo: 2.2.3 -> 2.2.4 --- pkgs/development/python-modules/somajo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index 543f075b281c..98f98741a986 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "somajo"; - version = "2.2.3"; + version = "2.2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "tsproisl"; repo = "SoMaJo"; rev = "refs/tags/v${version}"; - hash = "sha256-EnYw8TSZLXgB4pZaZBgxaO13PpTDx4lGsdGJ+51A6wE="; + hash = "sha256-vO3wEM3WkPQqq+ureJY+cpRHQ4cOLPV6DukA5LOscEM="; }; propagatedBuildInputs = [ From f1d554545d188b6981741aafdadcccbbb87460a7 Mon Sep 17 00:00:00 2001 From: "\"r3n3gad3p3arl\"" <20760527+r3n3gad3p3arl@users.noreply.github.com> Date: Sat, 17 Jun 2023 19:53:36 -0500 Subject: [PATCH 14/19] vimPlugins.scnvim: init at 2023-04-29 --- pkgs/applications/editors/vim/plugins/vim-plugin-names | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 8499f305f1b5..295a1f00c48b 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -682,6 +682,7 @@ https://github.com/rust-lang/rust.vim/,, https://github.com/hauleth/sad.vim/,, https://github.com/vmware-archive/salt-vim/,, https://github.com/lewis6991/satellite.nvim/,HEAD, +https://github.com/davidgranstrom/scnvim/,HEAD, https://github.com/tiagovla/scope.nvim/,HEAD, https://github.com/Xuyuanp/scrollbar.nvim/,, https://github.com/cakebaker/scss-syntax.vim/,, From 30ebc020335d8f259a3df2c4ea6dde7d0d44fce5 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 18 Jun 2023 01:14:43 +0000 Subject: [PATCH 15/19] kube-router: unpin go1.19 --- pkgs/applications/networking/cluster/kube-router/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index 192ea2d4c970..a953a8b82be7 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/ruSSq+iHmJDFHH+mLoqtdljAGlc15lXjTqq+luJIU8="; + hash = "sha256-/ruSSq+iHmJDFHH+mLoqtdljAGlc15lXjTqq+luJIU8="; }; vendorHash = "sha256-U2TvH4TPBI6verEcyv0Z+ZFAKbADgzncJhW1IAJw4Ms="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index feaa33a9a89e..afebed181e4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9224,9 +9224,7 @@ with pkgs; kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { }; - kube-router = callPackage ../applications/networking/cluster/kube-router { - buildGoModule = buildGo119Module; # go 1.20 build failure - }; + kube-router = callPackage ../applications/networking/cluster/kube-router { }; kubepug = callPackage ../development/tools/kubepug { }; From bbc6120f858a1f447d6cbfce1c860c4eb3e4a3cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Jun 2023 01:57:44 +0000 Subject: [PATCH 16/19] circleci-cli: 0.1.26837 -> 0.1.26896 --- pkgs/development/tools/misc/circleci-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index e43deabfaa00..5a47aefbd452 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.26837"; + version = "0.1.26896"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-psl3I8kvBE+akVuz5bj9xFzKTUX7Lj2kBVzNN5fpltM="; + sha256 = "sha256-nSqQr5fLkmN8ePc4JigHOMi7cXmmbpj4m864Ed/jYUw="; }; - vendorHash = "sha256-LzDofZI54cWP4FQfINq3tQbSi4c9/N1v0YH/aSzttNo="; + vendorHash = "sha256-IUDiKAwhJdDkp7qXPMcP6+QjEZvevBH0IFKFPAsHKio="; nativeBuildInputs = [ installShellFiles ]; From dae5bd09cc47b156cab61d5da18cdcce1c68341c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Jun 2023 02:16:37 +0000 Subject: [PATCH 17/19] kapp: 0.57.0 -> 0.57.1 --- pkgs/tools/networking/kapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/kapp/default.nix b/pkgs/tools/networking/kapp/default.nix index 8ceb935464e6..1170fffad96c 100644 --- a/pkgs/tools/networking/kapp/default.nix +++ b/pkgs/tools/networking/kapp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kapp"; - version = "0.57.0"; + version = "0.57.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-kapp"; rev = "v${version}"; - sha256 = "sha256-kcG5Ag+1sMy+qePd8NwPFBgwNAboH6d6315fbpi8nTc="; + sha256 = "sha256-JNo6+WlMcIUGb/36GM6ofvJBIJnF4oRocdYsEw7V1Ks="; }; vendorHash = null; From a04605dda395f96151b14bf051a5c1f41e8bfbd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Jun 2023 02:57:02 +0000 Subject: [PATCH 18/19] hcloud: 1.34.1 -> 1.35.0 --- pkgs/development/tools/hcloud/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index 0fbce0647b3a..6b3fe3cb84f8 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hcloud"; - version = "1.34.1"; + version = "1.35.0"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-sibLu/lar1up1E0QiNRiWOwHqb8eYtE01tSLh8d2cqs="; + sha256 = "sha256-Bk5IaJp7BzME2nBA/Y3AACyOPY/fRt1AP1qfrsAaHiw="; }; - vendorHash = "sha256-Q9le/jbWkABlobn4qG/h48HEDYAPSkiy1N9YlUo6swQ="; + vendorHash = "sha256-3Ot0evdpV7HcWiJLzAJeRXg2rpc9zOUU6LohmOwkR3g="; ldflags = [ "-s" "-w" From c6e0ad48c9137bafc546fee4558251eb650b9024 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Jun 2023 03:10:03 +0000 Subject: [PATCH 19/19] zincsearch: 0.4.5 -> 0.4.6 --- pkgs/servers/search/zincsearch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/search/zincsearch/default.nix b/pkgs/servers/search/zincsearch/default.nix index a6079b75d91c..d38f729c2be4 100644 --- a/pkgs/servers/search/zincsearch/default.nix +++ b/pkgs/servers/search/zincsearch/default.nix @@ -5,12 +5,12 @@ }: let - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "zinclabs"; repo = "zincsearch"; rev = "v${version}"; - hash = "sha256-V4eI7cur+KI+PEcplQJdTBaT0czpN0ENN30W5rrzE+k="; + hash = "sha256-M2QNrQFMZJuJ2BlGmHT1eGGWccXqjLSjuEppP8uTWJw="; }; webui = buildNpmPackage { @@ -40,7 +40,7 @@ buildGoModule rec { cp -r ${webui}/share/zinc-ui web/dist ''; - vendorHash = "sha256-TYs1iRUA4WC3iMS508c7jUC3Co86CKYjL5WFlnoyPhg="; + vendorHash = "sha256-/uZh50ImKWW7vYMfRqTbTAMUoRTZ9jXMbc3K16wYJkE="; subPackages = [ "cmd/zincsearch" ]; ldflags = [