nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-28 02:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next-22.05 into staging-22.05

Browse Source
This commit is contained in:
github-actions[bot]
2022-10-04 00:22:31 +00:00
committed by GitHub
parent f937ae9217 e931ff4e74
commit cdd545ac76
4 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/networking/instant-messengers/gajim/default.nix
View File

@@ -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 ]

7
pkgs/applications/virtualization/docker/default.nix
View File

@@ -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;

6
pkgs/tools/security/vault/default.nix
View File

@@ -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 = [ "." ];

12
pkgs/tools/security/vault/vault-bin.nix
View File

@@ -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 {