nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-22 08:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-22.05 into staging-next-22.05

Browse Source
This commit is contained in:
github-actions[bot]
2022-08-25 00:16:22 +00:00
committed by GitHub
parent 0a5c91edc3 294ef54a1e
commit 2c8a7a516e
9 changed files with 43 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/mailreaders/thunderbird/packages.nix
View File

@@ -4,13 +4,13 @@ rec {
thunderbird = thunderbird-91;
thunderbird-91 = (buildMozillaMach rec {
pname = "thunderbird";
version = "91.12.0";
version = "91.13.0";
application = "comm/mail";
applicationName = "Mozilla Thunderbird";
binaryName = pname;
src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 = "1c0200a84ccc4124127d472713d72c4ff7ece8d61ad120d5c45c732a3ab4f86a2edfea23a8bf26e4739d24956654aec30e7bc59a28af17fbbf10f3d67466649a";
sha512 = "e73d3db4333ad659ec1ab249bd261e8c28301c125d0c39b473c83f8fccace6d4916a2bfef14fc20c065055ff6bbd3ca618b5aab178241b53509543640dcd541a";
};
extraPatches = [
# The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.

29
pkgs/applications/virtualization/open-vm-tools/default.nix
View File

@@ -1,20 +1,20 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper, autoreconfHook
{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook
, bash, fuse3, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto
, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst
, pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which
, libdrm, udev
, libdrm, udev, util-linux
, withX ? true
}:
stdenv.mkDerivation rec {
pname = "open-vm-tools";
version = "12.0.0";
version = "12.0.5";
src = fetchFromGitHub {
owner = "vmware";
repo = "open-vm-tools";
rev = "stable-${version}";
sha256 = "sha256-agWTGf8x6bxZ7S5bU2scHt8IdLLe/hZdaEMfHIK9d8U=";
sha256 = "sha256-rjYYRh4ZWAd9iELW2/4PZvMOfQfgwtGcrI2icaed2Eg=";
};
sourceRoot = "${src.name}/open-vm-tools";
@@ -25,21 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [ fuse3 glib icu libdnet libdrm libmspack libtirpc openssl pam procps rpcsvc-proto udev xercesc ]
++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ];
patches = [
# glibc 2.35 and GCC 11 & 12 reporting possible array bounds overflow
# Will be fixed in the release after 12.0.0
(fetchpatch {
url = "https://github.com/vmware/open-vm-tools/commit/de6d129476724668b8903e2a87654f50ba21b1b2.patch";
sha256 = "1cqhm868g40kcp8qzzwq10zd4bah9ypaw1qawnli5d240mlkpfhh";
})
];
prePatch = ''
cd ..
'';
postPatch = ''
cd open-vm-tools
sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' Makefile.am
sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am
sed -i 's,usr/bin,''${prefix}/usr/bin,' scripts/Makefile.am
@@ -51,6 +37,13 @@ stdenv.mkDerivation rec {
# Make reboot work, shutdown is not in /sbin on NixOS
sed -i 's,/sbin/shutdown,shutdown,' lib/system/systemLinux.c
# Fix paths to fuse3 (we do not use fuse2 so that is not modified)
sed -i 's,/bin/fusermount3,${fuse3}/bin/fusermount3,' vmhgfs-fuse/config.c
substituteInPlace services/plugins/vix/foundryToolsDaemon.c \
--replace "/usr/bin/vmhgfs-fuse" "${placeholder "out"}/bin/vmhgfs-fuse" \
--replace "/bin/mount" "${util-linux}/bin/mount"
'';
configureFlags = [

8
pkgs/development/libraries/getdns/default.nix
View File

@@ -12,7 +12,7 @@ in rec {
getdns = stdenv.mkDerivation rec {
pname = "getdns";
version = "1.7.0";
version = "1.7.2";
outputs = [ "out" "dev" "lib" "man" ];
src = fetchurl {
@@ -20,7 +20,9 @@ in rec {
with builtins;
concatStringsSep "-" (splitVersion version)
}/${pname}-${version}.tar.gz";
sha256 = "sha256-6ocTzl4HesdrFBjOtq/SXm1OOelgD29egdOjoTpg9lI=";
sha256 =
# upstream publishes hashes in hex format
"db89fd2a940000e03ecf48d0232b4532e5f0602e80b592be406fd57ad76fdd17";
};
nativeBuildInputs = [ cmake doxygen ];
@@ -49,7 +51,7 @@ in rec {
stubby = stdenv.mkDerivation rec {
pname = "stubby";
version = "0.4.0";
version = "0.4.2";
outputs = [ "out" "man" "stubbyExampleJson" ];
inherit (getdns) src;

30
pkgs/os-specific/linux/kernel/hardened/patches.json
View File

@@ -22,32 +22,32 @@
"5.10": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.136-hardened1.patch",
"sha256": "1mw30dy0xk2l12gds0kf7mjxbfamjxdwshkwc4kcics9rf57mgx6",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.136-hardened1/linux-hardened-5.10.136-hardened1.patch"
"name": "linux-hardened-5.10.137-hardened1.patch",
"sha256": "0qh94vcvrrd7kl4c32nbrw6bndvy8chkjfcip89akp7ks22w5yhp",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.137-hardened1/linux-hardened-5.10.137-hardened1.patch"
},
"sha256": "0naiwihlj6aswnqwdz3xzmga98xpj5lf2iy9vxqzdng7b46rs28w",
"version": "5.10.136"
"sha256": "1j0n2r793pkvymjc70fzqwqi6h2j1wkja2kx012ydmsk2i6wssy1",
"version": "5.10.137"
},
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.60-hardened1.patch",
"sha256": "1w93qgwycicwjp3aiklm6c6yvg0gq674pxcxvbsdd0c1p0b4y8dk",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.60-hardened1/linux-hardened-5.15.60-hardened1.patch"
"name": "linux-hardened-5.15.62-hardened1.patch",
"sha256": "08znbgkwsw9gl7hjcqrbj1aqysnxqj7bh8xikqvmpx54qqbk6brh",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.62-hardened1/linux-hardened-5.15.62-hardened1.patch"
},
"sha256": "0yi3bvqz4qn8nvgr910ic09zvpisafwi282j0y2gvbvgr7vlb59d",
"version": "5.15.60"
"sha256": "0hgiag3mvdlcr6ckfy4bdr7h4471zqi53ahfybdvdkapivg7r086",
"version": "5.15.62"
},
"5.18": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.18.17-hardened1.patch",
"sha256": "0vic9y72d3vfw66y32yrgh7q2wgjk902780ik2viylwr3f5xq1yq",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.18.17-hardened1/linux-hardened-5.18.17-hardened1.patch"
"name": "linux-hardened-5.18.19-hardened1.patch",
"sha256": "1q61641b8lr87h04kjpd7izgi4kxdvknsn8ssmcs8n6fk6cswv8c",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.18.19-hardened1/linux-hardened-5.18.19-hardened1.patch"
},
"sha256": "0i7yms65b8kxjm92ahic0787vb9h7xblbwp1v6cq8zpns3ivv0ih",
"version": "5.18.17"
"sha256": "1mc8zhiw0v7fka64mydpdrxkrvy0jyqggq5lghw3pyqj2wjrpw6z",
"version": "5.18.19"
},
"5.4": {
"patch": {

4
pkgs/os-specific/linux/kernel/linux-5.10.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.136";
version = "5.10.137";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0naiwihlj6aswnqwdz3xzmga98xpj5lf2iy9vxqzdng7b46rs28w";
sha256 = "1j0n2r793pkvymjc70fzqwqi6h2j1wkja2kx012ydmsk2i6wssy1";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.15.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.15.61";
version = "5.15.62";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -15,6 +15,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0hpx0ziz162lc41jwi2ybj3qgidinjcsp71lchvmp6h0vyiddj9v";
sha256 = "0hgiag3mvdlcr6ckfy4bdr7h4471zqi53ahfybdvdkapivg7r086";
};
} // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-5.18.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.18.18";
version = "5.18.19";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0as0cslwz6zdiwd5wzcjggw3qpa9hzvfmxlhy72jdhn5vk47dhy1";
sha256 = "1mc8zhiw0v7fka64mydpdrxkrvy0jyqggq5lghw3pyqj2wjrpw6z";
};
} // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-5.19.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.19.2";
version = "5.19.3";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0gg63y078k886clgfq4k5n7nh2r0359ksvf8wd06rv01alghmr28";
sha256 = "08978hjl4khc0v8nb8wvrjnc8x8csvpf7airawpb4pvg0rrdcfsi";
};
} // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-libre.nix
View File

@@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "18837";
sha256 = "0645lkbh5bi9a8nhdyh21h7rrw8x8pmb7la08zn7gpkmwvk3wnwx";
rev = "18880";
sha256 = "1h5r57iv71hhx5w85m04c17dslib1rlymanbn23ll9qslv5ag4gn";
}
, ...
}: