public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 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-09-21 00:03:22 +00:00 committed by GitHub
commit 7a7495bcb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1180,14 +1180,18 @@ self: super: {
# $HOME, which we don't have in our build sandbox. # $HOME, which we don't have in our build sandbox.
cabal-install-parsers = dontCheck super.cabal-install-parsers; cabal-install-parsers = dontCheck super.cabal-install-parsers;
# jailbreak and patch (for pandoc >= 2.12) ensure compilation with newer dependencies. # Update to 0.15.0.0 which fixes a security vulnerability
# can both be removed at the next release (current is 0.13.0.0) # by removing a fundamentally insecure feature. Backporting
gitit = doJailbreak (appendPatch super.gitit # a “breaking” release for this seems necessary.
(pkgs.fetchpatch { # See https://nvd.nist.gov/vuln/detail/CVE-2021-38711
url = "https://github.com/jgm/gitit/commit/e8c9d94be332e2f73de9b0eee222a2a09f191faf.patch"; # https://github.com/jgm/gitit/blob/0.15.0.0/CHANGES
sha256 = "1rl2c3sz8cd2c3qwv9b640853s4bblcknvfv29k472wqhs62mwz1"; gitit = overrideCabal super.gitit (old: {
includes = [ "src/**" ]; jailbreak = true;
})); version = "0.15.0.0";
sha256 = "05kz7dxmiabp0gkivn5ngmn3xah3h7a14a421qw6nx2ld1cr9vgf";
revision = null;
editedCabalFile = null;
});
# Test suite requires database # Test suite requires database
persistent-mysql = dontCheck super.persistent-mysql; persistent-mysql = dontCheck super.persistent-mysql;