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 staging-next-21.05 into staging-21.05

Browse Source
This commit is contained in:
github-actions[bot]
2021-11-28 00:09:54 +00:00
committed by GitHub
parent c5ce6a0005 211069ec69
commit 06fa5a722e
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/editors/emacs/elisp-packages/org-generated.nix
View File

@@ -4,10 +4,10 @@
elpaBuild {
pname = "org";
ename = "org";
version = "20210519";
version = "20210920";
src = fetchurl {
url = "https://orgmode.org/elpa/org-20210519.tar";
sha256 = "14vchfg69wai1yxv1fzvjk185gnfr7d9qrdijf0qmbbr5znci8rf";
url = "https://orgmode.org/elpa/org-20210920.tar";
sha256 = "01b44npf0rxq7c4ddygc3n3cv3h7afs41az0nfs67a5x7ag6c1jj";
};
packageRequires = [];
meta = {
@@ -19,10 +19,10 @@
elpaBuild {
pname = "org-plus-contrib";
ename = "org-plus-contrib";
version = "20210519";
version = "20210920";
src = fetchurl {
url = "https://orgmode.org/elpa/org-plus-contrib-20210519.tar";
sha256 = "0g765fsc7ssn779xnhjzrxy1sz5b019h7dk1q26yk2w6i540ybfl";
url = "https://orgmode.org/elpa/org-plus-contrib-20210920.tar";
sha256 = "1m376fnm8hrm83hgx4b0y21lzdrbxjp83bv45plvrjky44qfdwfn";
};
packageRequires = [];
meta = {

5
pkgs/development/libraries/wolfssl/default.nix
View File

@@ -22,6 +22,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/wolfSSL/wolfssl/commit/822aa92fccf77558e250131c1c6e9bb84d07afe8.patch";
sha256 = "1n7774hy9ybbxmg8dldqnhw279k7fkxwvw1s2mjjhkzra9w5x2zy";
})
(fetchpatch {
name = "CVE-2021-38597.patch";
url = "https://github.com/wolfSSL/wolfssl/commit/f93083be72a3b3d956b52a7ec13f307a27b6e093.patch";
sha256 = "1b9zxisc15mm1s6sl8dmpaw520hcndymf6b003xpwsb5070xcld0";
})
];
# almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed