haskellPackages.gitit: backport via frozen package set

NixOS · Sep 21, 2021 · c3faa59 · c3faa59
1 parent 5041848
commit c3faa59
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 51 deletions.
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1183,18 +1183,7 @@ self: super: {
   # $HOME, which we don't have in our build sandbox.
   cabal-install-parsers = dontCheck super.cabal-install-parsers;
 
-  # Update to 0.15.0.0 which fixes a security vulnerability
-  # by removing a fundamentally insecure feature. Backporting
-  # a “breaking” release for this seems necessary.
-  # See https://nvd.nist.gov/vuln/detail/CVE-2021-38711
-  #     https://github.com/jgm/gitit/blob/0.15.0.0/CHANGES
-  gitit = overrideCabal super.gitit (old: {
-    jailbreak = true;
-    version = "0.15.0.0";
-    sha256 = "05kz7dxmiabp0gkivn5ngmn3xah3h7a14a421qw6nx2ld1cr9vgf";
-    revision = null;
-    editedCabalFile = null;
-  });
+  gitit = doJailbreak super.gitit;
 
   # Test suite requires database
   persistent-mysql = dontCheck super.persistent-mysql;

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/frozen-packages.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/frozen-packages.yaml
@@ -5856,7 +5856,7 @@ default-package-overrides:
 - github-webhooks == 0.15.0
 - githud == 3.2.2
 - gitignore == 1.1
-- gitit == 0.13.0.0
+- gitit == 0.15.0.0
 - gitlab-api == 0.0.0.2
 - gitlab-haskell == 0.2.5
 - gitlib == 3.1.3

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix