From 21d04197e1975a162a854cffee7b04adde6e830b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 29 Sep 2022 06:10:11 +0200 Subject: [PATCH 1/4] =?UTF-8?q?gajim:=201.4.7=20=E2=86=92=201.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 61be216937c80dca3556a4b2fb9a9abf65154aec, with nbxmpp override added) --- .../instant-messengers/gajim/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 2cd6b897d768..f8485e5e9bde 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,11 +22,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.4.7"; + version = "1.5.1"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - sha256 = "sha256-GkgHvzo0sxBIgk5P/3Yr0eFiL0ZOc6QmwJaE3Ck2hPM="; + sha256 = "sha256-FjRrAswoE1yuDoR42U3ppzvEvFN6K/VBdQ0w99wXPtM="; }; buildInputs = [ @@ -50,7 +50,17 @@ python3.pkgs.buildPythonApplication rec { ''; propagatedBuildInputs = with python3.pkgs; [ - nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools packaging gssapi + (nbxmpp.overrideAttrs (_: { + version = "3.2.2"; + src = fetchFromGitLab { + domain = "dev.gajim.org"; + owner = "gajim"; + repo = "python-nbxmpp"; + rev = "3.2.2"; + sha256 = "sha256-WVE8evbfWdQNsuDEQF7WfEYDQEKGKXElKQBkUn7bJ1I="; + }; + })) + pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools packaging gssapi ] ++ lib.optionals enableE2E [ pycrypto python-gnupg ] ++ lib.optional enableRST docutils ++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ] From 0adc445063b8ba16f04736c4c44fbd9cee30839f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 3 Oct 2022 10:11:32 +0200 Subject: [PATCH 2/4] docker: fix build by using go 1.18 Broken probably since update in 749fbb8 (PR #193197) --- pkgs/applications/virtualization/docker/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 2059be473adb..546cb61aeb9c 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -10,9 +10,9 @@ rec { , containerdRev, containerdSha256 , tiniRev, tiniSha256, buildxSupport ? true, composeSupport ? true # package dependencies - , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage + , stdenv, fetchFromGitHub, fetchpatch, buildGo118Package , makeWrapper, installShellFiles, pkg-config, glibc - , go-md2man, go, containerd, runc, docker-proxy, tini, libtool + , go-md2man, go_1_18, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose_2 , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, libseccomp, rootlesskit, slirp4netns, fuse-overlayfs @@ -20,6 +20,9 @@ rec { , clientOnly ? !stdenv.isLinux, symlinkJoin }: let + go = go_1_18; + buildGoPackage = buildGo118Package; + docker-runc = runc.overrideAttrs (oldAttrs: { name = "docker-runc-${version}"; inherit version; From 723ea19cc154713d1ad7c6751d404e25ed5d3d9f Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 28 Sep 2022 20:39:11 +0100 Subject: [PATCH 3/4] vault: 1.10.5 -> 1.10.6 --- pkgs/tools/security/vault/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index a682b9cbb5bb..264e8189e52e 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.10.5"; + version = "1.10.6"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-c9E+5WviguvZFPryWuXjcocgZdZsithZPmZ1iIC3Gck="; + sha256 = "sha256-YCLhQxT1yIScYulJectv5bNkGOB8I7cKMAneay6iWcc="; }; - vendorSha256 = "sha256-AKh7MICGhzZsyeJ8uj/F2lx/G1nh8e3Q6ZXzHtZ+P38="; + vendorSha256 = "sha256-7IdzOEJsT3tD/4L5bg1CQGVCHkXgzvlxLVnSOACkRzQ="; subPackages = [ "." ]; From 574f4f298c3e37ce286c64eee5862bb11f652871 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 28 Sep 2022 20:39:47 +0100 Subject: [PATCH 4/4] vault-bin: 1.10.5 -> 1.10.6 --- pkgs/tools/security/vault/vault-bin.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 62c202548401..cab92b1bf0f5 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.10.5"; + version = "1.10.6"; src = let @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-/tOaKSXx+rnpp0HWjCqgdZtaZZJruyNmWohPdijl2wI="; - aarch64-linux = "sha256-nGjVhzhxIfrEkxCf0SQ6pojgM/ZR9ySmSNXsj+3ZA/o="; - i686-linux = "sha256-ec8w2Y4nNYD8ELJauZFd8k3gdTU3wxoxALaL6kjnhKY="; - x86_64-darwin = "sha256-ubEFX1MX767CTfjnAhU/0SV3n6Rz+YJSoVmXph6Iw0Q="; - aarch64-darwin = "sha256-dxK7nGWi+2TCc9EcY8HJ2bcEFHmYGzAXCJ0rAvSCMeo="; + x86_64-linux = "sha256-U7Onzvnw393OqmFH4paJ7V2cYR0bFN5ElQrbz3iTt4c="; + aarch64-linux = "sha256-CgAKjigKT1LSHbRGs4Ixe6VGMaQtAXrkg3m62BMlD7w="; + i686-linux = "sha256-aBDL4sLDTTDjYKC9Enbme4OCBeNtofokIXf4J8LRosM="; + x86_64-darwin = "sha256-bGYNk2jea76TBYTLMdEzWpblvxHDL0l8ibhqCwQ/jmY="; + aarch64-darwin = "sha256-anWyi7i9r+AbPnLp8Go5ynH9Abz3VJWZXtNfo1ZN9TM="; }; in fetchzip {