From 2bd7d6c37baa47b11070fe822330a0c2c8eabd39 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Sun, 16 Jul 2023 10:53:37 +0200 Subject: [PATCH 1/8] inadyn: explicitly set localstatedir & sysconfdir Otherwise this service will fail to start with: inadyn[600988]: No write permission to /nix/store/pw5mi9rcrfwihwp4yr8azn91lvqzh07q-inadyn-2.11.0/var/run, aborting. Signed-off-by: Rouven Czerwinski (cherry picked from commit 6d49e50f5f25ec1325da8ac622f32795fac5355c) --- pkgs/tools/networking/inadyn/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index c0bcb5fd0a2d..be79588371df 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { buildInputs = [ gnutls libite libconfuse ]; + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; + enableParallelBuilding = true; meta = with lib; { From 0198e7a7bbcfb04de0572f201f2602382104a9b0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 16 Jul 2023 13:11:43 +0200 Subject: [PATCH 2/8] mautrix-whatsapp: 0.8.6 -> 0.9.0 ChangeLog: https://github.com/mautrix/whatsapp/releases/tag/v0.9.0 (cherry picked from commit 83f9715ad8c30fd333ff3a16a71ceccee196138a) --- pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 146c297c902d..7033bb4af5a3 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.8.6"; + version = "0.9.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-+uMpAsIadkdUrKkAr6ejOc1NfRIISA2R0AOjIXGXVpY="; + hash = "sha256-9o8AjZclSVzpAIqnW28/iaP10pA5cg7eC1q/kbMI3jI="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-emUCf6ZKFjBDr5WEKzYfbBNR44FDbjedmCgHfkjHQtw="; + vendorSha256 = "sha256-Gnr3+653gy3C8G0NSYsjsQFkfDPs013pyl/ARD5yweM="; doCheck = false; From 99590fe398add875ffcbf9147ba8cab0e10ce26a Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sun, 16 Jul 2023 13:25:38 +0000 Subject: [PATCH 3/8] discord: 0.0.27 -> 0.0.28 (cherry picked from commit 435da031005b589e4ab90b78a95ab5aa29762995) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 2bf96fcb4691..e56a47a3ff4d 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,7 +1,7 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.27"; + stable = "0.0.28"; ptb = "0.0.44"; canary = "0.0.162"; development = "0.0.217"; @@ -16,7 +16,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "sha256-6fHaiPBcv7TQVh+TatIEYXZ/LwPmnCmU/QWXKFgUR7U="; + sha256 = "sha256-JwxVVm/QIBLoVyQ2Ff/MX06UNgZ+dAsD960GsCg1M+U="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; From e9df99ffacb674654e4741a1a098d53ff667115b Mon Sep 17 00:00:00 2001 From: squalus Date: Sun, 16 Jul 2023 13:32:04 -0700 Subject: [PATCH 4/8] standardnotes: 3.165.9 -> 3.166.9 (cherry picked from commit 9f3cb3e6d26fa6797ca8d2370981bfd40d91fff8) --- pkgs/applications/editors/standardnotes/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/standardnotes/src.json b/pkgs/applications/editors/standardnotes/src.json index afb5f1ebf155..85e361f4813f 100644 --- a/pkgs/applications/editors/standardnotes/src.json +++ b/pkgs/applications/editors/standardnotes/src.json @@ -1,13 +1,13 @@ { - "version": "3.165.9", + "version": "3.166.9", "deb": { "x86_64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.165.9/standard-notes-3.165.9-linux-amd64.deb", - "hash": "sha512-DR2wxCi0RgEeAQWbegJv7Zhp6rtO2PWF7RceVNd2KBrLigsRZbRfLVsPLesprKexZoGIryhYvOksecpX51VdUA==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.166.9/standard-notes-3.166.9-linux-amd64.deb", + "hash": "sha512-D85W50K3jRBKhrPz3Wa9aClnHFMRPQ0YgP71uypfcCcuKVnKd3Ol1sFzsyMzl2uhB0aGOkpd2OB+OHceVFqmag==" }, "aarch64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.165.9/standard-notes-3.165.9-linux-arm64.deb", - "hash": "sha512-ACYzEHQgw4pPZNgOUSDihAFY1dJ91Tmw3y2Lf1iihiOVcGn4qt5XJS2BG0+/bEWZjp0iuBKsfrlfWfSi6c95Sg==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.166.9/standard-notes-3.166.9-linux-arm64.deb", + "hash": "sha512-pbBLqIaDjQoVGCOfpOxwjWRSMoQsefsYOHTRNTNlDDNO7DRUa/WeSbOYOgLJM5yGIBVXQoRmO7ycWfAWVAPIDQ==" } } } From 64e54a7a25df13acb0d9a48a7f55dc304c3c395c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 7 Jul 2023 21:55:55 +0200 Subject: [PATCH 5/8] =?UTF-8?q?ocamlPackages.gsl:=20disable=20for=20OCaml?= =?UTF-8?q?=20=E2=89=A5=205.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 492f52edfb722af81686b4cdfbe692e2bce462c6) --- pkgs/development/ocaml-modules/gsl/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/gsl/default.nix b/pkgs/development/ocaml-modules/gsl/default.nix index 02a49fd71773..48dd8817a565 100644 --- a/pkgs/development/ocaml-modules/gsl/default.nix +++ b/pkgs/development/ocaml-modules/gsl/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }: +{ lib, stdenv, ocaml, fetchFromGitHub, fetchpatch, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }: + +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "gsl is not available for OCaml ${ocaml.version}" buildDunePackage rec { pname = "gsl"; @@ -36,8 +39,6 @@ buildDunePackage rec { }) ]; - duneVersion = "3"; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator gsl ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; From 636f531daa78520467a992d495ac910dc446951f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 7 Jul 2023 21:56:00 +0200 Subject: [PATCH 6/8] =?UTF-8?q?ocamlPackages.printbox-text:=20disable=20te?= =?UTF-8?q?sts=20with=20OCaml=20=E2=89=A5=205.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 021e77649a8d19375caf531f7e2423c8e336e29f) --- pkgs/development/ocaml-modules/printbox/text.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/printbox/text.nix b/pkgs/development/ocaml-modules/printbox/text.nix index 43e7e18566ad..dd823b2264c8 100644 --- a/pkgs/development/ocaml-modules/printbox/text.nix +++ b/pkgs/development/ocaml-modules/printbox/text.nix @@ -1,11 +1,12 @@ -{ buildDunePackage, printbox, uucp, uutf, mdx }: +{ buildDunePackage, lib, ocaml, printbox, uucp, uutf, mdx }: buildDunePackage { pname = "printbox-text"; - inherit (printbox) src version useDune2 doCheck; + inherit (printbox) src version; propagatedBuildInputs = [ printbox uucp uutf ]; + doCheck = printbox.doCheck && lib.versionOlder ocaml.version "5.0"; nativeCheckInputs = [ mdx.bin ]; meta = printbox.meta // { From 0c6b8c7ba77a329d7b82b01b2b9b1ce8407ae62c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 13 Jul 2023 14:36:47 +1000 Subject: [PATCH 7/8] terraform: 1.5.2 -> 1.5.3 Diff: https://github.com/hashicorp/terraform/compare/v1.5.2...v1.5.3 Changelog: https://github.com/hashicorp/terraform/blob/v1.5.3/CHANGELOG.md (cherry picked from commit b7cc5afe4c0669d85a29aa80516dd4b1bda9f566) --- pkgs/applications/networking/cluster/terraform/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 111ec28dfaab..1aff80d275f2 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -166,9 +166,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.5.2"; - hash = "sha256-Ri2nWLjPPBINXyPIQSbnd1L+t7QLgXiTOgqX8Dk/rXg="; - vendorHash = "sha256-tfCfJj39VP+P4qhJTpEIAi4XB+6VYtVKkV/bTrtnFA0="; + version = "1.5.3"; + hash = "sha256-4TnTYzjy8v5+mcV/JIiMPLCTPSanfmbTGzwlMovwlOo="; + vendorHash = "sha256-lQgWNMBf+ioNxzAV7tnTQSIS840XdI9fg9duuwoK+U4="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; From 5f6211931372b1fb0c4ada2602ffb4d421893c06 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 23:40:09 +0200 Subject: [PATCH 8/8] ferretdb: 1.4.0 -> 1.5.0 (#244053) (cherry picked from commit d744b1281e30cb90d9d3d632b0cd75645780e8ca) Co-authored-by: Julien Malka --- pkgs/servers/nosql/ferretdb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix index 7173b90626d6..1c3b649351d8 100644 --- a/pkgs/servers/nosql/ferretdb/default.nix +++ b/pkgs/servers/nosql/ferretdb/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ferretdb"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - sha256 = "sha256-WSjIUnjMdrRsdygDqQaxNosc/XGrSz/Yx3xauDkQDzU="; + hash = "sha256-PBxpb6lXLtOM9nxw2rNlMoevyWbmuTZMIjzr4y3UCMc="; }; postPatch = '' @@ -19,7 +19,7 @@ buildGoModule rec { echo nixpkgs > build/version/package.txt ''; - vendorSha256 = "sha256-xWmzTqy0yoOZRvMllsVaRkUmAUWE/Nn4UFyT+0JiCFU="; + vendorSha256 = "sha256-AsjKqlUwP+IgTErsGhBrELhVHMJ88twU3U4E9U/rP24="; CGO_ENABLED = 0;