From ff9df147c99f32353fbbcb787c52c05d8f964f5d Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 16 Aug 2021 11:40:38 +0200 Subject: [PATCH 01/42] nixos/gdm: remove udev-settle dependency See https://github.com/NixOS/nixpkgs/issues/73095 It looks like it can finally be removed: the `Failed to open gpu '/dev/dri/card0'` error is gone and the nixosTests.gnome test is passing (checked 4 times in a row). --- nixos/modules/services/x11/display-managers/gdm.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 0f7941364d2e..d49f03adc213 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -174,9 +174,6 @@ in "systemd-machined.service" # setSessionScript wants AccountsService "accounts-daemon.service" - # Failed to open gpu '/dev/dri/card0': GDBus.Error:org.freedesktop.DBus.Error.AccessDenied: Operation not permitted - # https://github.com/NixOS/nixpkgs/pull/25311#issuecomment-609417621 - "systemd-udev-settle.service" ]; systemd.services.display-manager.after = [ @@ -186,7 +183,6 @@ in "getty@tty${gdm.initialVT}.service" "plymouth-quit.service" "plymouth-start.service" - "systemd-udev-settle.service" ]; systemd.services.display-manager.conflicts = [ "getty@tty${gdm.initialVT}.service" From 784c5795c0096778974dbafdfacd845b27a16bc2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Aug 2021 21:29:30 +0000 Subject: [PATCH 02/42] xmrig: 6.14.0 -> 6.14.1 --- pkgs/applications/misc/xmrig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index affce3a71aaa..c0120e33992f 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.14.0"; + version = "6.14.1"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-h+Y7hXkenoLT83eG0w6YEfOuEocejXgvqRMq1DwWwT0="; + sha256 = "sha256-JJ20LKA4gnPXO6d2Cegr3I67k+ZZc69hdL1dTUIF5OM="; }; nativeBuildInputs = [ cmake ]; From ef7cb07023e2bfae721d656acd3052d154b7f8ca Mon Sep 17 00:00:00 2001 From: Zack A Date: Mon, 30 Aug 2021 16:14:22 -0700 Subject: [PATCH 03/42] radicle-upstream: 0.2.9 -> 0.2.10 --- .../git-and-tools/radicle-upstream/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix index 8774e69e48c6..6d521151bd82 100644 --- a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix +++ b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix @@ -2,17 +2,17 @@ let pname = "radicle-upstream"; - version = "0.2.9"; + version = "0.2.10"; name = "${pname}-${version}"; srcs = { x86_64-linux = fetchurl { url = "https://releases.radicle.xyz/radicle-upstream-${version}.AppImage"; - sha256 = "sha256-chju3ZEFFLOzE9FakUK2izm/5ejELdL/iWMtM3bRpWY="; + sha256 = "sha256-iZC7FzYaQsCoAq/soi5g2oo/Xd2PtZgO/wR8zDgN4Fk="; }; x86_64-darwin = fetchurl { url = "https://releases.radicle.xyz/radicle-upstream-${version}.dmg"; - sha256 = "sha256-OOqe4diRcJWHHOa6jBpljPoA3FQOKlghMhKGQ242GnM="; + sha256 = "sha256-gc5OrNu7t0VJrjLQO7+7TWvEj7D51WmMJfL/KQDMgvA="; }; }; src = srcs.${stdenv.hostPlatform.system}; From 7b2b277105e581f4a42c3f108de232c5bde3c344 Mon Sep 17 00:00:00 2001 From: Lin Yinfeng Date: Thu, 2 Sep 2021 11:18:34 +0800 Subject: [PATCH 04/42] teamspeak_client: fix desktop icon --- .../networking/instant-messengers/teamspeak/client.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 048d40082daa..513f427ee13d 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -81,9 +81,9 @@ stdenv.mkDerivation rec { mv * $out/lib/teamspeak/ # Make a desktop item - mkdir -p $out/share/applications/ $out/share/icons/ + mkdir -p $out/share/applications/ $out/share/icons/hicolor/64x64/apps/ unzip ${pluginsdk} - cp pluginsdk/docs/client_html/images/logo.png $out/share/icons/teamspeak.png + cp pluginsdk/docs/client_html/images/logo.png $out/share/icons/hicolor/64x64/apps/teamspeak.png cp ${desktopItem}/share/applications/* $out/share/applications/ # Make a symlink to the binary from bin. From dc2002ce44fd6a19f7575540c09380b362c81a8d Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Tue, 7 Sep 2021 10:20:59 +0300 Subject: [PATCH 05/42] atlassian-jira: 8.16.1 -> 8.19 --- pkgs/servers/atlassian/jira.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 608326117f15..6f2f777745f4 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "atlassian-jira"; - version = "8.16.1"; + version = "8.19.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "sha256-0J+P4E9hYPbYBb6qvtBjH1jhKrDW187+309YBHORNZA="; + sha256 = "sha256-ewunieLbHCfdS/JjKo9P6S6kK98aUGsyfupUcMyULo4="; }; buildPhase = '' @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { description = "Proprietary issue tracking product, also providing project management functions"; homepage = "https://www.atlassian.com/software/jira"; license = licenses.unfree; - maintainers = with maintainers; [ fpletz globin ciil ]; + maintainers = with maintainers; [ fpletz globin ciil megheaiulian ]; }; } From d9f78e95bad026c5232f534fdb236b46c3ea8b1a Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Wed, 8 Sep 2021 02:35:22 +0800 Subject: [PATCH 06/42] nlohmann_json: 3.9.1 -> 3.10.2 --- pkgs/development/libraries/nlohmann_json/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 41a967a5b709..2854074ef149 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -3,23 +3,15 @@ stdenv.mkDerivation rec { pname = "nlohmann_json"; - version = "3.9.1"; + version = "3.10.2"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${version}"; - sha256 = "sha256-THordDPdH2qwk6lFTgeFmkl7iDuA/7YH71PTUe6vJCs="; + sha256 = "/OFNfukrIyfJmD0ko174aud9T6ZOesHANJjyfk4q/Vs="; }; - patches = [ - # https://github.com/nlohmann/json/pull/2690 - (fetchpatch { - url = "https://github.com/nlohmann/json/commit/53a9850eebb88c6ff95f6042d08d5c0cc9d18097.patch"; - sha256 = "k+Og00nXNg5IsFQY5fWD3xVQQXUFFTie44UXole0S1M="; - }) - ]; - nativeBuildInputs = [ cmake ]; cmakeFlags = [ From 13af44ba2a0fd6a4ef8efbb6a8007e5e4f45e6e3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 11 Sep 2021 04:20:00 +0000 Subject: [PATCH 07/42] ecl: fix nativeBuildInputs --- pkgs/development/compilers/ecl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index 44f7eab62ee5..5896e9488268 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -16,7 +16,7 @@ let url="https://common-lisp.net/project/ecl/static/files/release/${name}.tgz"; sha256="000906nnq25177bgsfndiw3iqqgrjc9spk10hzk653sbz3f7anmi"; }; - buildInputs = [ + nativeBuildInputs = [ libtool autoconf automake texinfo makeWrapper ]; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ let in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs propagatedBuildInputs; + inherit nativeBuildInputs propagatedBuildInputs; src = fetchurl { inherit (s) url sha256; From 18bd22822c1054b74d165597ee504cece999cec8 Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Wed, 8 Sep 2021 16:47:38 +0800 Subject: [PATCH 08/42] nlohmann_json: update meta information Update meta.description and meta.homepage to match the GitHub About. Add meta.changelog --- pkgs/development/libraries/nlohmann_json/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 2854074ef149..e152c4fa20a8 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -26,8 +26,9 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/lib64"; meta = with lib; { - description = "Header only C++ library for the JSON file format"; - homepage = "https://github.com/nlohmann/json"; + description = "JSON for Modern C++"; + homepage = "https://json.nlohmann.me"; + changelog = "https://github.com/nlohmann/json/blob/develop/ChangeLog.md"; license = licenses.mit; platforms = platforms.all; }; From 6b48a031d9cc47356b4e7e3e2cb8967446890261 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 12 Sep 2021 23:36:24 -0400 Subject: [PATCH 09/42] fcl: 0.6.1 -> 0.7.0 --- pkgs/development/libraries/fcl/default.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/fcl/default.nix b/pkgs/development/libraries/fcl/default.nix index 33a600805846..4e13a3f7113f 100644 --- a/pkgs/development/libraries/fcl/default.nix +++ b/pkgs/development/libraries/fcl/default.nix @@ -2,30 +2,15 @@ stdenv.mkDerivation rec { pname = "fcl"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "flexible-collision-library"; repo = pname; rev = version; - sha256 = "1i1sd0fsvk5d529aw8aw29bsmymqgcmj3ci35sz58nzp2wjn0l5d"; + sha256 = "0f5lhg6f9np7w16s6wz4mb349bycil1irk8z8ylfjwllxi4n6x7a"; }; - patches = [ - # Disable SSE on Emscripten (required for the next patch to apply cleanly) - # https://github.com/flexible-collision-library/fcl/pull/470 - (fetchpatch { - url = "https://github.com/flexible-collision-library/fcl/commit/83a1af61ba4efa81ec0b552b3121100044a8cf46.patch"; - sha256 = "0bbkv4xpkl3c0i8qdlkghj6qkybrrd491c8rd2cqnxfgspcd40p0"; - }) - # Detect SSE support to fix building on ARM - # https://github.com/flexible-collision-library/fcl/pull/506 - (fetchpatch { - url = "https://github.com/flexible-collision-library/fcl/commit/cbfe1e9405aa68138ed1a8f33736429b85500dea.patch"; - sha256 = "18qip8gwhm3fvbz1cvzf625rh5msq8m4669ld1m60fv6z50clr9h"; - }) - ]; - nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ eigen libccd octomap ]; From f76136e109acdcd5b64451a08b478e13bd5e19a4 Mon Sep 17 00:00:00 2001 From: Malte <3236302+malte-christian@users.noreply.github.com> Date: Wed, 1 Sep 2021 12:13:55 +0200 Subject: [PATCH 10/42] gnunet: 0.15.0 -> 0.15.3 --- pkgs/applications/networking/p2p/gnunet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index fb1abae6bf3c..2ccf4ff4b860 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.15.0"; + version = "0.15.3"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "sha256-zKI9b7QIkKXrLMrkuPfnTI5OhNP8ovQZ13XLSljdmmc="; + sha256 = "sha256-1iZpqPQeB46qIgznejL08/gB4wmTV66McFSY/nOITsU="; }; enableParallelBuilding = true; From cc5c902fdf94b798c3b68e55ebb7e1a1185113a1 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Sun, 12 Sep 2021 20:03:35 +0200 Subject: [PATCH 11/42] github-runner: use dummy SHA-1 as `GitInfoCommitHash` The runner only references `GitInfoCommitHash`/`CommitHash` to print informational log entries. To allow for just referencing the tag of a version instead of the commit hash, this commit sets the value of the `GitInfoCommitHash` to a static dummy value. --- .../tools/continuous-integration/github-runner/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index b7da1970da2b..2d7df078f8cc 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -30,6 +30,7 @@ let dotnetSdk = dotnetCorePackages.sdk_3_1; runtimeId = "linux-x64"; + fakeSha1 = "0000000000000000000000000000000000000000"; in stdenv.mkDerivation rec { pname = "github-runner"; @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "actions"; repo = "runner"; - rev = "c8caf59bb7adaa87c4cf8f61372670d338a13f2d"; # v${version} + rev = "v${version}"; sha256 = "sha256-Nl1FSjwweVqdQEVhqt4PEcqZbF7htNT279yx1nGuAe0="; }; @@ -126,7 +127,7 @@ stdenv.mkDerivation rec { -p:PackageRuntime="${runtimeId}" \ -p:BUILDCONFIG="Release" \ -p:RunnerVersion="${version}" \ - -p:GitInfoCommitHash="${src.rev}" \ + -p:GitInfoCommitHash="${fakeSha1}" \ src/dir.proj runHook postBuild @@ -191,7 +192,7 @@ stdenv.mkDerivation rec { -p:PackageRuntime="${runtimeId}" \ -p:BUILDCONFIG="Debug" \ -p:RunnerVersion="${version}" \ - -p:GitInfoCommitHash="${src.rev}" \ + -p:GitInfoCommitHash="${fakeSha1}" \ src/dir.proj runHook postCheck From e8bbcc79fd07014b146835dfd7f5eba2079d9a55 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Mon, 13 Sep 2021 18:32:38 +0200 Subject: [PATCH 12/42] github-runner: prevent self-updates As of yet, a patch caused the runner to discard update messages. Unfortunately, GitHub keeps sending update messages to outdated runners causing them to no longer pick up jobs. This commit causes the runner to send a high version to GitHub which should be more recent for quite a time. That way, GitHub does not send update message and keeps scheduling jobs even for outdated runners. Naturally, an oudated runner can still break at any time as GitHub's current approach assumes that all runners are always up-to-date. We should still strive for quick nixpkgs updates but this patch should give us some time. --- .../github-runner/default.nix | 5 ++-- .../patches/ignore-self-update.patch | 24 ------------------ .../patches/prevent-self-update.patch | 25 +++++++++++++++++++ 3 files changed, 28 insertions(+), 26 deletions(-) delete mode 100644 pkgs/development/tools/continuous-integration/github-runner/patches/ignore-self-update.patch create mode 100644 pkgs/development/tools/continuous-integration/github-runner/patches/prevent-self-update.patch diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 2d7df078f8cc..711148c530a0 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -68,8 +68,9 @@ stdenv.mkDerivation rec { ./patches/use-get-directory-for-diag.patch # Don't try to install systemd service ./patches/dont-install-systemd-service.patch - # Don't try to self-update runner (cannot be disabled, see https://github.com/actions/runner/issues/485) - ./patches/ignore-self-update.patch + # Prevent the runner from starting a self-update for new versions + # (upstream issue: https://github.com/actions/runner/issues/485) + ./patches/prevent-self-update.patch ]; postPatch = '' diff --git a/pkgs/development/tools/continuous-integration/github-runner/patches/ignore-self-update.patch b/pkgs/development/tools/continuous-integration/github-runner/patches/ignore-self-update.patch deleted file mode 100644 index b505bbc7503b..000000000000 --- a/pkgs/development/tools/continuous-integration/github-runner/patches/ignore-self-update.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/Runner.Listener/Runner.cs b/src/Runner.Listener/Runner.cs -index 68b0b4e..5da21fe 100644 ---- a/src/Runner.Listener/Runner.cs -+++ b/src/Runner.Listener/Runner.cs -@@ -391,18 +391,7 @@ namespace GitHub.Runner.Listener - HostContext.WritePerfCounter($"MessageReceived_{message.MessageType}"); - if (string.Equals(message.MessageType, AgentRefreshMessage.MessageType, StringComparison.OrdinalIgnoreCase)) - { -- if (autoUpdateInProgress == false) -- { -- autoUpdateInProgress = true; -- var runnerUpdateMessage = JsonUtility.FromString(message.Body); -- var selfUpdater = HostContext.GetService(); -- selfUpdateTask = selfUpdater.SelfUpdate(runnerUpdateMessage, jobDispatcher, !runOnce && HostContext.StartupType != StartupType.Service, HostContext.RunnerShutdownToken); -- Trace.Info("Refresh message received, kick-off selfupdate background process."); -- } -- else -- { -- Trace.Info("Refresh message received, skip autoupdate since a previous autoupdate is already running."); -- } -+ Trace.Info("Ignoring received refresh message (would trigger self-update)."); - } - else if (string.Equals(message.MessageType, JobRequestMessageTypes.PipelineAgentJobRequest, StringComparison.OrdinalIgnoreCase)) - { diff --git a/pkgs/development/tools/continuous-integration/github-runner/patches/prevent-self-update.patch b/pkgs/development/tools/continuous-integration/github-runner/patches/prevent-self-update.patch new file mode 100644 index 000000000000..da73cd75a096 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/github-runner/patches/prevent-self-update.patch @@ -0,0 +1,25 @@ +From 8b77c9c61058842e031dd176df2b9c79bc2c0e28 Mon Sep 17 00:00:00 2001 +From: Vincent Haupert +Date: Sun, 12 Sep 2021 19:52:21 +0200 +Subject: [PATCH] Use a fake version to prevent self-update + +--- + src/Runner.Listener/MessageListener.cs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Runner.Listener/MessageListener.cs b/src/Runner.Listener/MessageListener.cs +index 71e5e43..29945e0 100644 +--- a/src/Runner.Listener/MessageListener.cs ++++ b/src/Runner.Listener/MessageListener.cs +@@ -65,7 +65,7 @@ namespace GitHub.Runner.Listener + { + Id = _settings.AgentId, + Name = _settings.AgentName, +- Version = BuildConstants.RunnerPackage.Version, ++ Version = "2.999.9", + OSDescription = RuntimeInformation.OSDescription, + }; + string sessionName = $"{Environment.MachineName ?? "RUNNER"}"; +-- +2.32.0 + From 82652bcc2c7440ee4432975fbb9e0ac8b0ea3551 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 05:01:15 +0000 Subject: [PATCH 13/42] cpp-utilities: 5.11.0 -> 5.11.1 --- pkgs/development/libraries/cpp-utilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 769f573f7afd..dcce68b927cf 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.11.0"; + version = "5.11.1"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ibZ/cj+pDLxUugz5jTc3FcVlytwS+R1RTtISbXe1mq4="; + sha256 = "sha256-H8BDuoSF5XkWgahGj7LCSsdXBbgcSjPLTmgUgamCij8="; }; nativeBuildInputs = [ cmake ]; From 0242a3641bc783d2fcd8009cfd1b300f40b3bd1a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 11:55:27 +0000 Subject: [PATCH 14/42] libsForQt5.qtutilities: 6.3.3 -> 6.5.0 --- pkgs/development/libraries/qtutilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 99cf50a7ba04..7871c1fd9a8d 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.3.3"; + version = "6.5.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RoI1huVei4SmAUhuYruzgod0/qIlnrZSHEMceQc2jzc="; + sha256 = "sha256-+W5EdnB0QbI22iDWRyj+ntp/l/Kc6VHca2LwmHA7pgA="; }; buildInputs = [ qtbase cpp-utilities ]; From cd641476cfcf8d5494e661debac9a3fe40f4cf32 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Tue, 14 Sep 2021 15:46:20 +0200 Subject: [PATCH 15/42] github-runner: 2.281.1 -> 2.282.0 --- .../tools/continuous-integration/github-runner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 711148c530a0..56dfe62042ff 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -34,13 +34,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.281.1"; + version = "2.282.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - sha256 = "sha256-Nl1FSjwweVqdQEVhqt4PEcqZbF7htNT279yx1nGuAe0="; + sha256 = "sha256-381xqBuysT5OR+SDhtSNCz0fOsDM7zC50EatAiXmpHU="; }; nativeBuildInputs = [ From 2dcab2aa335b91ad761f0dfb5e03007ea5432c38 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 14:19:25 +0000 Subject: [PATCH 16/42] python38Packages.pytest-snapshot: 0.6.1 -> 0.6.3 --- pkgs/development/python-modules/pytest-snapshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-snapshot/default.nix b/pkgs/development/python-modules/pytest-snapshot/default.nix index 140994cbf266..5c7ca4350abe 100644 --- a/pkgs/development/python-modules/pytest-snapshot/default.nix +++ b/pkgs/development/python-modules/pytest-snapshot/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-snapshot"; - version = "0.6.1"; + version = "0.6.3"; src = fetchPypi { inherit pname version; - sha256 = "ee8e9af118ff55ed13bf8e8b520714c52665ae44f6228563a600a08d62839b54"; + sha256 = "f99152df98587f883f37bb0315f082ab3e0c565f53413f1193bb0019b992c3ea"; }; nativeBuildInputs = [ setuptools-scm ]; From f7978d726a881a6911a596b19d246604ad8bab75 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Tue, 14 Sep 2021 15:08:46 +0000 Subject: [PATCH 17/42] exploitdb: 20221-09-10 -> 2021-09-14 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 911592736801..31b7c9eb16a4 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-09-10"; + version = "2021-09-14"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-OU9IchkouABYw0k4O4WBLu1aklLCH/S90IPMPLOZWY0="; + sha256 = "sha256-6VTJzR0kdQEFLW0aG3iZGthJF9nYd7NIkzSNhHpgF44="; }; installPhase = '' From f3aeba71a3381672dfe60ef34c561605bd2afd7a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 17:32:23 +0000 Subject: [PATCH 18/42] python38Packages.xmlsec: 1.3.11 -> 1.3.12 --- pkgs/development/python-modules/xmlsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xmlsec/default.nix b/pkgs/development/python-modules/xmlsec/default.nix index b8c60f1b6425..77b1abef2fc9 100644 --- a/pkgs/development/python-modules/xmlsec/default.nix +++ b/pkgs/development/python-modules/xmlsec/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "xmlsec"; - version = "1.3.11"; + version = "1.3.12"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zS6q/38xeEoH3ZnOgfp2cxPfO6GDT6pBQ+4sBwAMrHo="; + sha256 = "2c86ac6ce570c9e04f04da0cd5e7d3db346e4b5b1d006311606368f17c756ef9"; }; # https://github.com/mehcode/python-xmlsec/issues/84#issuecomment-632930116 From d5c8c84384fe710727b1be0fbb1ef7572aadd97e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 17:50:09 +0000 Subject: [PATCH 19/42] qbittorrent: 4.3.5 -> 4.3.8 --- pkgs/applications/networking/p2p/qbittorrent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index bd4fafed1119..38e1b7cfceb2 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -12,13 +12,13 @@ assert trackerSearch -> (python3 != null); with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.3.5"; + version = "4.3.8"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - sha256 = "1vdk42f8rxffyfydjk5cgzg5gl88ng2pynlyxw5ajh08wvkkjzgy"; + sha256 = "sha256-on5folzKuRoVlvDOpme+aWxUKUC5PnO+N3L51qwG2gY="; }; enableParallelBuilding = true; From 1c9cbe8a05567e918c3b12941569a7e63d54e539 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 18:44:37 +0000 Subject: [PATCH 20/42] opensmt: 2.1.0 -> 2.1.1 --- pkgs/applications/science/logic/opensmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index fd22b7b1add8..2ef494cca266 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "opensmt"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "usi-verification-and-security"; repo = "opensmt"; rev = "v${version}"; - sha256 = "sha256-m8TpMBY1r0h8GJTHM4FLBuZtX+WK/Q7RTXUnNmUWV+o="; + sha256 = "sha256-StnEvkSSKDHGYXIQsDUu9T9Ztl+RtDTP47JvnRyH0bE="; }; nativeBuildInputs = [ cmake bison flex ]; From 0c31bd3d4efda50128ffedfe1daaceeaf90d5763 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 21:35:17 +0000 Subject: [PATCH 21/42] yq-go: 4.12.1 -> 4.12.2 --- pkgs/development/tools/yq-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 5bd458ecdd60..88d2c555b576 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yq-go"; - version = "4.12.1"; + version = "4.12.2"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-3L4SM698SJvHw1eXxxxL9OehDqQ6Al1XBL2WRG49PZU="; + sha256 = "sha256-sd9S9aWilFrdxKnUaZBWYPDvC5mPCjqwBjpIRHgd98k="; }; vendorSha256 = "sha256-u7elWOW/tz1ISM/KC1njkZmPi8AEEssZ5QtxK/+1/1I="; From d37f5847d3a536fe00b144b84858ffe8de6dd956 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 22:01:29 +0000 Subject: [PATCH 22/42] rtsp-simple-server: 0.17.2 -> 0.17.3 --- pkgs/servers/rtsp-simple-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index c6897167cefa..e6605fb6ce26 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.17.2"; + version = "0.17.3"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - sha256 = "sha256-z3dT5WtchG3FeWZsqKOPUk9D5G6srr5+DgY0A0nWSzk="; + sha256 = "sha256-9V6yblRnOAZBYuGChjeDyOTWjCCVhdFxljSndEr7GdY="; }; - vendorSha256 = "sha256-buQW5jMnHyHc/oYdmfTnoktFRG3V3SNxn7t5mAwmiJI="; + vendorSha256 = "sha256-lFyRMoI+frzAa7sL8wIzUgzJRrCQjt9Ri8T9pHIpoug="; # Tests need docker doCheck = false; From 313e03f4fb55ef46f6474fba981f8d25bb7b0ea8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 23:54:19 +0000 Subject: [PATCH 23/42] spaceship-prompt: 3.14.0 -> 3.14.1 --- pkgs/shells/zsh/spaceship-prompt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix index 618a35c2f6ad..f1dcb9ead9c9 100644 --- a/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "spaceship-prompt"; - version = "3.14.0"; + version = "3.14.1"; src = fetchFromGitHub { owner = "denysdovhan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K9dNQAMW/Ms6rlAmfgQCqMiA7S4gLh9ZhvUoQiLoHOY="; + sha256 = "sha256-/Q2vsCIDsHUSBavJoHX3L0NQ7REoQmaiRgHVGiLtNPE="; }; dontBuild = true; From 268c8d77ca7302dd8c72370532e5158a0a3e4a2e Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Wed, 15 Sep 2021 00:12:28 +0000 Subject: [PATCH 24/42] vscode: 1.60.0 -> 1.60.1 --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index e6a5a9d5dca7..028bd77809f9 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0g49765pnimh107pw3q7dlgd6jcmr5gagsvxrdx8i93mbxb0xm0c"; - x86_64-darwin = "1837fcpllblm970jxsal0ahxsnjmsgydy6g6qn51hp7f797gi7zb"; - aarch64-linux = "1bpmgv6hjyb7jl9v8qyqiyr0brl4xq3wnls2v9hirja6ls1x14cx"; - aarch64-darwin = "0qksfscbiyr2ynw3j86g8wm7myyabkjwx03ik3z6rrv7dffb5yii"; - armv7l-linux = "063p2wy1wl57p43f3md0wp2d981nnb650hyqs9rgqm4mlk2s168g"; + x86_64-linux = "10iai5k0hvyvishp4gbamvsn9ff8dfm6kvql08h3plr8zrvmaian"; + x86_64-darwin = "1cspla4cxw0l5cg44qywv3jgwyk2g7sx5lk1s4xhbrqz76knzcr7"; + aarch64-linux = "1dc4gfaxlrsd637d8w2c5h4l8c96phv14pmkhmyc1jp1a0q6d5ja"; + aarch64-darwin = "06d8ng6k62mh1qhba0c6nj2lag4vi7i50d2sx3nk8r2v8azwyrmk"; + armv7l-linux = "030c8az831n73w35xfbjpympwvfprf1h4lxy8j5sysm4fbpzi03m"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.60.0"; + version = "1.60.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From 304dffb16092a017d88a1577fbe304bea5e73375 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 15 Sep 2021 00:34:43 +0000 Subject: [PATCH 25/42] electron_14: 14.0.0 -> 14.0.1 https://github.com/electron/electron/releases/tag/v14.0.1 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 040c289720ce..c04994978f4d 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -125,13 +125,13 @@ rec { headers = "1cxrpw5yzbv0gscmyzh0041smxirifp9f8nchn212csanjdycn6x"; }; - electron_14 = mkElectron "14.0.0" { - x86_64-linux = "0a40533a50a42e6668e5265a84e2983979eededbb61f9e201d569d8b1b37ce0f"; - x86_64-darwin = "4025c50cb9a0dce1a7b5d5698ee5412e55abeae386329ffe293152a8c42388e8"; - i686-linux = "955280a0eb862eef913f9f394c7c7574138a5a48ffa85c59e84cc0163564fbfa"; - armv7l-linux = "825684b3f759bc6c5d2e5be7c6a7679b7a1b8e0d9091f7d2f9904d0c24f6c978"; - aarch64-linux = "367e76b34dcc58371232c87f540dd227c51de94ce8a916761379c3c4b890dd80"; - aarch64-darwin = "0df8ced31e56243adb17f328e8d580a50e22d46403b2bb28d8922d2515904d94"; - headers = "129rw4a05ixkyiiag2dgadcm34ndfajd896k11siahcij7rn4j7g"; + electron_14 = mkElectron "14.0.1" { + x86_64-linux = "8a364aaff446f7ac034bcad7130330ce5a9384eb0f8736aca30ea1a4ffc7cb2f"; + x86_64-darwin = "66f14e804b0a40e50562fcb4ed44a0dca4fd27be5420b787045276fcb9a4b9fd"; + i686-linux = "7ee08215f4e6b144ee8a17796f0967c12ee6755c29617f398047e0d5e1dd52bb"; + armv7l-linux = "8dd205bb9fad6ae46344b524dda6e76991f67a78b67d6f6361431b2e5cb8e942"; + aarch64-linux = "02f8c4e0af9370082404f13ace86faa6e927ee9d5899722bb2fac50a030cb213"; + aarch64-darwin = "a8816214dd31c5a44a51fd43c6709e7a7fe69750e5e42b75bfa747402ea3f75f"; + headers = "08b6sx1bq1mshvdj1qzv8vxalmf8qb57qhs9krz0l4c7wf722idm"; }; } From 3f26111fb81f4d8ee2d28816b632935564b293bc Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 15 Sep 2021 00:35:02 +0000 Subject: [PATCH 26/42] electron_13: 13.3.0 -> 13.4.0 https://github.com/electron/electron/releases/tag/v13.4.0 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index c04994978f4d..ed59eeda66d5 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -115,14 +115,14 @@ rec { headers = "040ikf5wcz9zm0kprpggl3jiw8lj4msnh8kjqaacjk480wgv6k5q"; }; - electron_13 = mkElectron "13.3.0" { - x86_64-linux = "dae470d4685c1e18ea399cb4607d598a325d1a5143d1fabc15e3ec112a65b65b"; - x86_64-darwin = "d8c673aca3cd5b0d573c24c9fd29ff6f6cea52daa2e9feb680c7d05c7982cf53"; - i686-linux = "1569e39548493d4cc6a4feed1386ab18238705d20ed98078567db5439b9cafa5"; - armv7l-linux = "91e6dec7be053a599cf4b6ab13e577ddb68fb35bd7a786c4f7e31a73b663aa59"; - aarch64-linux = "147a43797e3aac97845a87f744cceacdfbed19b8017eea25f2e48cf519e20cfe"; - aarch64-darwin = "f0e0b7e1a9a1ce41abbc2b64a8f1070b966535b4c90e6e293481c2e47a3f1a90"; - headers = "1cxrpw5yzbv0gscmyzh0041smxirifp9f8nchn212csanjdycn6x"; + electron_13 = mkElectron "13.4.0" { + x86_64-linux = "383549a918c6e3990345adc3ba8bb6551ab73c7c945a3137d44cb6e109c4b849"; + x86_64-darwin = "902bf07fb7e84f824cce7addb31743eda375d9d4a3f41ac1cf74c152fb43250b"; + i686-linux = "f7c8570a1fcbeab9211f182b957c16e17914df529c474643e4ae24e397055542"; + armv7l-linux = "e783ec550da7e948e51be58dc395e14805b29053be084a1423edfcdccd639dbd"; + aarch64-linux = "3daac7966d6bb609d09780a13eeb9cf2cabdda79d25c4ba30b6fb6b95371c8b5"; + aarch64-darwin = "54c7cdaf0efaf9e9b19a5619a6403c656cd8c0f5d4108b6f6577f6968f263618"; + headers = "0wm92fppm9xqik9mbabpsh04da062q1sfhcdjczihxsfaxs3klaq"; }; electron_14 = mkElectron "14.0.1" { From 40d83a9a2159809d2d47fc6598665c184578f1cf Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 15 Sep 2021 00:36:12 +0000 Subject: [PATCH 27/42] electron_12: 12.1.0 -> 12.1.1 https://github.com/electron/electron/releases/tag/v12.1.1 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index ed59eeda66d5..1f98857c592b 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -105,14 +105,14 @@ rec { headers = "1zkdgpjrh1dc9j8qyrrrh49v24960yhvwi2c530qbpf2azgqj71b"; }; - electron_12 = mkElectron "12.1.0" { - x86_64-linux = "b573f88a892e3f282352466db711734a678289edce83271f16865d63df4e8c85"; - x86_64-darwin = "0c036793cfebb6ed680b13e11804560ec301fc26c68737045a3e9dcee3e8930b"; - i686-linux = "0dced2796addc5e5440ca58691efd3ad683ae41906dea84ef517dd855c3df5a1"; - armv7l-linux = "a1a07f550869f9a22b1ddc0f325ff5d60a792c7c8cf206c70f26c8d8867ced27"; - aarch64-linux = "58da83b9e5c231ba0078cb2723530ab1be2c97d0c4036c88c7146cdf1a08ddac"; - aarch64-darwin = "01e9f4c12f86eef6e79a594880b2415decad604fb1a7bb5d8086f6dcebc2de7c"; - headers = "040ikf5wcz9zm0kprpggl3jiw8lj4msnh8kjqaacjk480wgv6k5q"; + electron_12 = mkElectron "12.1.1" { + x86_64-linux = "21bcd5d415c147307082890498240f9f096e60053ebd90e81765375ecc00add3"; + x86_64-darwin = "1ff96e9770dec3b61b7fcf8b2d5a334ed317cf271d91233604549df1e42cdc9b"; + i686-linux = "b1e64e953ec9168dfa6da65888637fa866a57c08e2c48f1f443474f7f96b2e2e"; + armv7l-linux = "f6a9c539df8c3699c45faeb5ffc5145b095af93604943e1e4c939f38fa1d6672"; + aarch64-linux = "35a51b39c53c4e79aa0af90401cbb94f0d9ea0e606d1f6226473015021c0ac48"; + aarch64-darwin = "5001583bd17cb3acb00f30c2a6e98e5f0b755d744c922d7eed9f166ac67964e0"; + headers = "1x7ilyiy3kk2b1crv0h8v6dcfv6yhf371pi14x7333bzhw558s2a"; }; electron_13 = mkElectron "13.4.0" { From f7a04bddd8e7c28936e314f55f1302ca68506aba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 00:51:18 +0000 Subject: [PATCH 28/42] telescope: 0.5.1 -> 0.5.2 --- pkgs/applications/networking/browsers/telescope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/telescope/default.nix b/pkgs/applications/networking/browsers/telescope/default.nix index 492709d88a50..dafcc0e63a88 100644 --- a/pkgs/applications/networking/browsers/telescope/default.nix +++ b/pkgs/applications/networking/browsers/telescope/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "telescope"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - sha256 = "0dd09r7b2gm9nv1q67yq4zk9f4v0fwqr5lw51crki9ii82gmj2h8"; + sha256 = "sha256-AdbFJfoicQUgJ9kesIWZ9ygttyjjDeC0UHRI98GwoZ8="; }; nativeBuildInputs = [ From 2ecd21c1cce634960584c6310b7cca158962e98e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 01:27:07 +0000 Subject: [PATCH 29/42] thicket: 0.1.4 -> 0.1.5 --- .../version-management/git-and-tools/thicket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/thicket/default.nix b/pkgs/applications/version-management/git-and-tools/thicket/default.nix index 3129bd2e2083..d8420b1cb33c 100644 --- a/pkgs/applications/version-management/git-and-tools/thicket/default.nix +++ b/pkgs/applications/version-management/git-and-tools/thicket/default.nix @@ -8,13 +8,13 @@ let in crystal.buildCrystalPackage rec { pname = "thicket"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "taylorthurlow"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A89E0CbV7VFB7W4ycFcZloP0J/d42agEuD+hs9a6a6E="; + sha256 = "sha256-7X1RKj/FWgJdgA7P746hU0ndUM49fH79ZNRSkvNZYFg="; }; format = "shards"; From 8465eb7493d949c3a8020e814d2f8a5fca08137d Mon Sep 17 00:00:00 2001 From: Vanilla Date: Wed, 15 Sep 2021 10:26:07 +0800 Subject: [PATCH 30/42] vscx/ms-vsliveshare-vsliveshare: 1.0.4673 -> 1.0.4836 --- .../vscode-extensions/ms-vsliveshare-vsliveshare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix index c111f01621b3..50a4dd26ee85 100644 --- a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix +++ b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix @@ -38,8 +38,8 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens mktplcRef = { name = "vsliveshare"; publisher = "ms-vsliveshare"; - version = "1.0.4673"; - sha256 = "1ys3lilc2r3n250s6pfvadrabnvqpzy74awjmvw79jrbvvk1iw1z"; + version = "1.0.4836"; + sha256 = "7hK2ptNU2mQt3iTZgkrKU9ZTVN+m7VFmAlXHxkiPL+o="; }; }).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: { nativeBuildInputs = nativeBuildInputs ++ [ From 1172c99c506ed4c3c7c8f47d3b51fb195eca5d96 Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Wed, 8 Sep 2021 02:30:30 +0800 Subject: [PATCH 31/42] nlohmann_json: enable checkPhase --- .../libraries/nlohmann_json/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index e152c4fa20a8..d8ae8fcaa4ae 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -1,7 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake +{ stdenv +, lib +, fetchFromGitHub +, cmake }: - -stdenv.mkDerivation rec { +let + testData = fetchFromGitHub { + owner = "nlohmann"; + repo = "json_test_data"; + rev = "v3.0.0"; + sha256 = "O6p2PFB7c2KE9VqWvmTaFywbW1hSzAP5V42EuemX+ls="; + }; +in stdenv.mkDerivation rec { pname = "nlohmann_json"; version = "3.10.2"; @@ -17,11 +26,14 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBuildTests=${if doCheck then "ON" else "OFF"}" "-DJSON_MultipleHeaders=ON" - ]; + ] ++ lib.optional doCheck "-DJSON_TestDataDirectory=${testData}"; - # A test cause the build to timeout https://github.com/nlohmann/json/issues/1816 - #doCheck = stdenv.hostPlatform == stdenv.buildPlatform; - doCheck = false; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + + # skip tests that require git or modify “installed files” + preCheck = '' + checkFlagsArray+=("ARGS=-LE 'not_reproducible|git_required'") + ''; postInstall = "rm -rf $out/lib64"; From 5545104ce310a43f4a23935754392bd81fa8f9f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 05:07:21 +0000 Subject: [PATCH 32/42] xcolor: 0.5.0 -> 0.5.1 --- pkgs/tools/graphics/xcolor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/xcolor/default.nix b/pkgs/tools/graphics/xcolor/default.nix index 95f21efe1ad9..707e9a95a127 100644 --- a/pkgs/tools/graphics/xcolor/default.nix +++ b/pkgs/tools/graphics/xcolor/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "xcolor"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "Soft"; repo = pname; rev = version; - sha256 = "0i04jwvjasrypnsfwdnvsvcygp8ckf1a5sxvjxaivy73cdvy34vk"; + sha256 = "sha256-NfmoBZek4hsga6RflE5EKkWarhCFIcTwEXhg2fpkxNE="; }; - cargoSha256 = "1r2s4iy5ls0svw5ww51m37jhrbvnj690ig6n9c60hzw1hl4krk30"; + cargoSha256 = "sha256-Zh73+FJ63SkusSavCqSCLbHVnU++4ZFSMFUIM7TnOj0="; nativeBuildInputs = [ pkg-config python3 installShellFiles copyDesktopItems ]; From f27bedec56dc32ba4253ae05434a1a46156010a9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 05:58:00 +0000 Subject: [PATCH 33/42] python38Packages.dataclasses-json: 0.5.5 -> 0.5.6 --- pkgs/development/python-modules/dataclasses-json/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index bfb179f035dc..196d3b913776 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "lidatong"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b8oWl8AteVuGYb4E+M9aDS2ERgnKN8wS17Y/Bs7ajcI="; + sha256 = "09253p0zjqfaqap7jgfgjl1jswwnz7mb6x7dqix09id92mnb89mf"; }; propagatedBuildInputs = [ From fe034d33be5ccf3efc850a6021a1ab41cf5831d1 Mon Sep 17 00:00:00 2001 From: Lara Date: Sat, 4 Sep 2021 22:42:26 +0200 Subject: [PATCH 34/42] nixos/gitlab: Enable roation of log files This commit enables a logrotate service for gitlab using the default values from omnibus. [1] [1] https://gitlab.com/gitlab-org/omnibus-gitlab/-/blob/master/files/gitlab-cookbooks/gitlab/attributes/default.rb#L754 Resolves #136723 --- nixos/modules/services/misc/gitlab.nix | 49 ++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 805deeee0c04..c1a1491b3cee 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -821,6 +821,40 @@ in { ''; }; + logrotate = { + enable = mkOption { + type = types.bool; + default = true; + description = '' + Enable rotation of log files. + ''; + }; + + frequency = mkOption { + type = types.str; + default = "daily"; + description = "How often to rotate the logs."; + }; + + keep = mkOption { + type = types.int; + default = 30; + description = "How many rotations to keep."; + }; + + extraConfig = mkOption { + type = types.lines; + default = '' + copytruncate + compress + ''; + description = '' + Extra logrotate config options for this path. Refer to + for details. + ''; + }; + }; + extraConfig = mkOption { type = types.attrs; default = {}; @@ -932,6 +966,21 @@ in { ensureUsers = singleton { name = cfg.databaseUsername; }; }; + # Enable rotation of log files + services.logrotate = { + enable = cfg.logrotate.enable; + paths = { + gitlab = { + path = "${cfg.statePath}/log/*.log"; + user = cfg.user; + group = cfg.group; + frequency = cfg.logrotate.frequency; + keep = cfg.logrotate.keep; + extraConfig = cfg.logrotate.extraConfig; + }; + }; + }; + # The postgresql module doesn't currently support concepts like # objects owners and extensions; for now we tack on what's needed # here. From f840898e8530ff44625b00b418072e52c97b426c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 08:11:39 +0000 Subject: [PATCH 35/42] python38Packages.google-cloud-firestore: 2.3.1 -> 2.3.2 --- .../python-modules/google-cloud-firestore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 00276d581761..c0ec04b4330f 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.3.1"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "8f8e513cae105ba17c4d3949091bd816cbf6075c6ac91b1f7acb4d40359f8a5a"; + sha256 = "6e2eb65ccd75c6579214fb2099cfb98c57b2b4907ccb38a2ed21f00f492b7a50"; }; propagatedBuildInputs = [ From 30df428d7e7b7f92b1000689921f5e82aa064439 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 08:16:44 +0000 Subject: [PATCH 36/42] cloudflared: 2021.8.7 -> 2021.9.0 --- pkgs/applications/networking/cloudflared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 5adb5bb65a8e..ddaaa6fd0da5 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.8.7"; + version = "2021.9.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-Q8Xjo60lR1x7Y9/jcxXX32IxVVlHmkr4ekIwWTgdwps="; + sha256 = "sha256-djgMTCDIVcaPI6to/pPN2hPi1tsKPxRCT30EL0OOEQU="; }; vendorSha256 = null; From 2742598f99872df6be44082f12421acb27677a89 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 13 Sep 2021 04:20:00 +0000 Subject: [PATCH 37/42] ocamlPackages.parany: 12.0.3 -> 12.1.1 --- pkgs/development/ocaml-modules/parany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/parany/default.nix b/pkgs/development/ocaml-modules/parany/default.nix index 6892a7a2e4d5..29213031f358 100644 --- a/pkgs/development/ocaml-modules/parany/default.nix +++ b/pkgs/development/ocaml-modules/parany/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "parany"; - version = "12.0.3"; + version = "12.1.1"; useDune2 = true; minimumOCamlVersion = "4.03.0"; @@ -11,7 +11,7 @@ buildDunePackage rec { owner = "UnixJunkie"; repo = pname; rev = "v${version}"; - sha256 = "1j962ak68kvv62bczjqxwlwvdgcvjfcs36qwq12nnm0pwlzkhg33"; + sha256 = "0s2sbmywy4yyh69dcrcqd85hd8jcd7qgfczy79nam4bvn87bjm72"; }; propagatedBuildInputs = [ ocamlnet cpu ]; From 2de65a8061cc23589cc4329079a9ef79ac030c6b Mon Sep 17 00:00:00 2001 From: nixbitcoin Date: Mon, 13 Sep 2021 12:34:18 +0000 Subject: [PATCH 38/42] electrs: 0.8.10 -> 0.8.11 --- pkgs/applications/blockchains/electrs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index cf2f4d3d47eb..527d368bf825 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.8.10"; + version = "0.8.11"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - sha256 = "0q7mvpflnzzm88jbsdxgvhk9jr5mvn23hhj2iwy2grnfngxsmz3y"; + sha256 = "024sdyvrx7s4inldamq4c8lv0iijjyd18j1mm9x6xf2clmvicaa6"; }; # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - cargoSha256 = "0i8npa840g4kz50n6x40z22x9apq8snw6xgjz4vn2kh67xc4c738"; + cargoSha256 = "0yl50ryxidbs9wkabz919mgbmsgsqjp1bjw792l1lkgncq8z9r5b"; meta = with lib; { description = "An efficient re-implementation of Electrum Server in Rust"; From a293c865425287c3098da223495bb77233c789f8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 10:39:29 +0000 Subject: [PATCH 39/42] python38Packages.pex: 2.1.49 -> 2.1.50 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 96eaa96aef85..ad8aca089e37 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.49"; + version = "2.1.50"; src = fetchPypi { inherit pname version; - sha256 = "af536388eeede93111d8ef0af4a80cbb3d847c1a1470c6f34f3abe83deac1b91"; + sha256 = "c67365b26060452631c0083a0f5d50af3cba9287b84b2c157404c959cb4bb74d"; }; nativeBuildInputs = [ setuptools ]; From b7eb0b990b054146a7f6280725c08add4257642b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 10:44:17 +0000 Subject: [PATCH 40/42] esbuild: 0.12.27 -> 0.12.28 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 083d374cd1ac..7e455c1fce40 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.27"; + version = "0.12.28"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-UclUTfm6fxoYEEdEEmO/j+WLZLe8SFzt7+Tej4bR0RU="; + sha256 = "sha256-SCOY70slGjTT9mUtaSr7qa1PF3nD7AM4AyP1CTVeWuY="; }; vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; From 8a7a1b06bac0025919eb92ea8ea671932feb8274 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 10:44:23 +0000 Subject: [PATCH 41/42] python38Packages.pg8000: 1.21.1 -> 1.21.2 --- pkgs/development/python-modules/pg8000/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index d8a002231057..aadcec698ae2 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.21.1"; + version = "1.21.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HMvuyTtw4uhTLfOr3caQXHghkJyW3Oqu91G1fFKRhpo="; + sha256 = "36a3b517408334967c1fa0d29656da03608d63122a372ec92c85f49aed2d24e3"; }; propagatedBuildInputs = [ From 7ac53ad7b954c1b349d4172c38767e8e77ac4640 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 11 Sep 2021 04:20:00 +0000 Subject: [PATCH 42/42] ocamlPackages.mdx: 1.10.1 -> 1.11.0 https://github.com/realworldocaml/mdx/releases/tag/1.11.0 --- pkgs/development/ocaml-modules/mdx/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index c8035eea42d3..2677f56584e7 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -1,21 +1,21 @@ { lib, fetchurl, buildDunePackage, ocaml , alcotest -, astring, cmdliner, cppo, fmt, logs, ocaml-version, odoc, ocaml_lwt, re, result, csexp +, astring, cmdliner, cppo, fmt, logs, ocaml-version, odoc-parser, ocaml_lwt, re, result, csexp , pandoc}: buildDunePackage rec { pname = "mdx"; - version = "1.10.1"; + version = "1.11.0"; useDune2 = true; src = fetchurl { url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz"; - sha256 = "10d4sfv4qk9569kj46pcaw6cih40v6bkgd44lmsp7cyfhvl8pa9x"; + sha256 = "1hk8ffh3d9hiibrj6691khnbmjnfs9psmiawnrbgi0577bw030wx"; }; nativeBuildInputs = [ cppo ]; buildInputs = [ cmdliner ]; - propagatedBuildInputs = [ astring fmt logs result csexp ocaml-version odoc re ]; + propagatedBuildInputs = [ astring fmt logs result csexp ocaml-version odoc-parser re ]; checkInputs = [ alcotest ocaml_lwt pandoc ]; doCheck = true; @@ -31,6 +31,7 @@ buildDunePackage rec { meta = { homepage = "https://github.com/realworldocaml/mdx"; description = "Executable OCaml code blocks inside markdown files"; + changelog = "https://github.com/realworldocaml/mdx/raw/${version}/CHANGES.md"; license = lib.licenses.isc; maintainers = [ lib.maintainers.romildo ]; };