nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-25 17:55:21 +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-12-05 00:15:26 +00:00
committed by GitHub
parent c3ddbada86 7187c12972
commit 2fa391558b
5 changed files with 73 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/profiles/base.nix
View File

@@ -20,7 +20,13 @@
pkgs.mkpasswd # for generating password files
# Some text editors.
pkgs.vim
(pkgs.vim.customize {
name = "vim";
vimrcConfig.packages.default = {
start = [ pkgs.vimPlugins.vim-nix ];
};
vimrcConfig.customRC = "syntax on";
})
# Some networking tools.
pkgs.fuse

20
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@@ -1,8 +1,8 @@
{
"stable": {
"version": "108.0.5359.71",
"sha256": "0pgzf6xrd71is1dld1arhq366vjp8p54x75zyx6y7vcjqj0a0v6b",
"sha256bin64": "0917rpkjs3aybgnv03b47qd8if226cdhv5fwhsv8hlka9wl4kv62",
"version": "108.0.5359.94",
"sha256": "1zmndi4q9x8fyixwl1mp5qyf883x9xafq7ipzf9vk9d8h62521q6",
"sha256bin64": "03s85hf4vxpil27c1kkdicihb42diyyxwfcjji0bq950nl8vpx2d",
"deps": {
"gn": {
"version": "2022-10-05",
@@ -13,9 +13,9 @@
},
"chromedriver": {
"version": "108.0.5359.71",
"sha256_linux": "12ljm3gnmgqv57p0qnva1zfdvy6cwfvdfjmyk82ziny0i2ylbhsg",
"sha256_darwin": "0c3f7yjmqr2111g87scy138vqxhim36zqgwqwnk22dlrpm92zydm",
"sha256_darwin_aarch64": "1gr0ascnnz3w8nrv2jqb7p7k97577ab9jwb4wdqiliwsjzmbqwbc"
"sha256_linux": "0lxmzmjpy4j5k3hx7wxdbbk87fr883a6323r9fj5nmylb230i3p4",
"sha256_darwin": "14kl58qlxkfq7hipg717nwawzcx7qzg77v322ikgrvqi03f0saci",
"sha256_darwin_aarch64": "08rbp1dqv1xvy1w9jsip3140frbifzblgrn6i9xr612hxysxhap6"
}
},
"beta": {
@@ -45,8 +45,8 @@
}
},
"ungoogled-chromium": {
"version": "108.0.5359.72",
"sha256": "1ijvphbmkzha8nbvz17dwypwj1lz7hzr7q9fvk6gma27b1m1d57m",
"version": "108.0.5359.95",
"sha256": "1b3r2yl8qkp8k0kq5yi0a1xsmglniqn3v318fhx0k12cagrgbd5b",
"sha256bin64": null,
"deps": {
"gn": {
@@ -56,8 +56,8 @@
"sha256": "1rhadb6qk867jafr85x2m3asis3jv7x06blhmad2d296p26d5w6x"
},
"ungoogled-patches": {
"rev": "108.0.5359.72-1",
"sha256": "0gv9566w1q0abam7ngjb0qw7kg2dp43lixm51m9avsvvb6a4wyzz"
"rev": "108.0.5359.95-1",
"sha256": "0fl95hw6ll0g4lrccfxhhnkz3plqm003z09dz8dr6ycx5x3vqk0b"
}
}
}

18
pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
View File

@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "lib/electron-main.js",
"version": "1.11.14",
"version": "1.11.15",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@@ -62,22 +62,23 @@
"@types/mkdirp": "^1.0.2",
"@types/pacote": "^11.1.1",
"@types/rimraf": "^3.0.2",
"@typescript-eslint/eslint-plugin": "^5.6.0",
"@typescript-eslint/parser": "^5.6.0",
"@typescript-eslint/eslint-plugin": "^5.42.0",
"@typescript-eslint/parser": "^5.42.0",
"allchange": "^1.0.6",
"app-builder-lib": "^22.14.10",
"asar": "^2.0.1",
"babel-jest": "^28.1.3",
"chokidar": "^3.5.2",
"detect-libc": "^1.0.3",
"electron": "^20",
"electron": "20.3.4",
"electron-builder": "^23.6.0",
"electron-builder-squirrel-windows": "^23.6.0",
"electron-devtools-installer": "^3.1.1",
"eslint": "7.18.0",
"eslint": "^8.26.0",
"eslint-config-google": "^0.14.0",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-matrix-org": "^0.4.0",
"eslint-plugin-matrix-org": "^0.7.0",
"eslint-plugin-unicorn": "^44.0.2",
"expect-playwright": "^0.8.0",
"find-npm-prefix": "^1.0.2",
"fs-extra": "^8.1.0",
@@ -121,7 +122,10 @@
"webapp.asar"
],
"linux": {
"target": "deb",
"target": [
"tar.gz",
"deb"
],
"category": "Network;InstantMessaging;Chat",
"maintainer": "support@element.io",
"desktop": {

8
pkgs/applications/networking/instant-messengers/element/pin.json
View File

@@ -1,6 +1,6 @@
{
"version": "1.11.14",
"desktopSrcHash": "91WCtb+ylVz9gSqOHb5GuSC1YZjDS3M8gdFIZYVls3c=",
"desktopYarnHash": "1ng9fwpwxsw91bzgd2kb2pdq927rkjv5rrrkmszvn55bj6ry7sqi",
"webHash": "06bv2qbbd7zj8987a6ah3bxdnr0qcxrimlns16shk1ciawd0c81d"
"version": "1.11.15",
"desktopSrcHash": "l+IjI3uvnOjaJA6IszDSuOO08SMqbUf8rI/u12g5Rxo=",
"desktopYarnHash": "024vd7xiwialfrag325558qjrqlfxzy9xq7jb15ysawand1k2xyv",
"webHash": "05q60p06y6z82g11nnc5w1rz069cyii64b77zrdag4v6gfap6b1d"
}

41
pkgs/development/libraries/botan/2.0.nix
View File

@@ -15,5 +15,46 @@ callPackage ./generic.nix (args // {
# our source tarball doesn't include the tests
excludes = [ "src/tests/*" ];
})
# https://github.com/randombit/botan/security/advisories/GHSA-4v9w-qvcq-6q7w
(fetchpatch {
name = "CVE-2022-43705-1.patch";
url = "https://github.com/randombit/botan/commit/fd83d9e262f63fb673e4c13ca37e5b768e41e812.patch";
hash = "sha256-f0vZGXalao1jqtaONlZna4alzpyLF4BbZwirQN+MPs0=";
})
(fetchpatch {
name = "CVE-2022-43705-2.patch";
url = "https://github.com/randombit/botan/commit/4e35073ff356e37c3adcf1ff3522e9d0d48c765f.patch";
hash = "sha256-BBoIMuI1ayesI0rhYbdlO6rphZE1C4LCYI7bwHd8bUw=";
})
(fetchpatch {
name = "CVE-2022-43705-3.patch";
url = "https://github.com/randombit/botan/commit/c2faa88b0281e5017be72e1c85d0c41f686e1928.patch";
hash = "sha256-n88gRLrxQG5/cundLyajd1IEi7x4aS5Ou3a1BudTrXI=";
})
(fetchpatch {
name = "CVE-2022-43705-4.patch";
url = "https://github.com/randombit/botan/commit/5d8d9fbf75c8b814ea609161bee525d520f5cb57.patch";
hash = "sha256-gqm9mG1NUyYfzMA3vjUjdU4aWOyHU4hiptpXGCR+HqM=";
})
(fetchpatch {
name = "CVE-2022-43705-5.patch";
url = "https://github.com/randombit/botan/commit/1829ef9d89614da1eacdf511356bdf98a970f5f5.patch";
hash = "sha256-Whi4GOT6CPmV8qE2Q9ktJ11aozR8xvDV8h6bIRgxMPA=";
})
(fetchpatch {
name = "CVE-2022-43705-6.patch";
url = "https://github.com/randombit/botan/commit/991b0159282781f2d5c06ff42a9ff00ee563e96b.patch";
hash = "sha256-vEgfAlE5Pl5V0kVsjFtxm51ODubs9nRi52l50AiaTsM=";
})
(fetchpatch {
name = "CVE-2022-43705-7.patch";
url = "https://github.com/randombit/botan/commit/a33689613127f319c0047fb96f092de16e7cb350.patch";
hash = "sha256-3/l6RjPZDXTGPGwYVNDL/G213hCEIn0RV0JmNxOt4UI=";
})
(fetchpatch {
name = "CVE-2022-43705-8.patch";
url = "https://github.com/randombit/botan/commit/909c62717855402e04dbaf8ffc085f444d547aae.patch";
hash = "sha256-AAsmNgwN8887nE84/BgJOcb6IuLK11HZoMJOhyeqDpI=";
})
];
})