diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c8fa354228ccd..f308a20522b84 100644 --- 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 index c0004537ea5f3..c6484571e180f 100644 --- 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 index 546077f90f39d..ec9f579b42ff5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -113599,43 +113599,6 @@ self: { }) {}; "gitit" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, blaze-html - , bytestring, ConfigFile, containers, directory, doctemplates, feed - , filepath, filestore, ghc, ghc-paths, happstack-server, hoauth2 - , hslogger, HStringTemplate, HTTP, http-client-tls, http-conduit - , json, mtl, network, network-bsd, network-uri, old-locale - , old-time, pandoc, pandoc-types, parsec, pretty, process, random - , recaptcha, safe, SHA, skylighting, split, syb, tagsoup, text - , time, uri-bytestring, url, utf8-string, uuid, xhtml, xml - , xml-conduit, xml-types, xss-sanitize, zlib - }: - mkDerivation { - pname = "gitit"; - version = "0.13.0.0"; - sha256 = "1d9vfjhr38xxpm0fq0b6dy581a1qacqg643njp8z2fz37rma3z15"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base base64-bytestring blaze-html bytestring ConfigFile - containers directory doctemplates feed filepath filestore ghc - ghc-paths happstack-server hoauth2 hslogger HStringTemplate HTTP - http-client-tls http-conduit json mtl network network-bsd - network-uri old-locale old-time pandoc pandoc-types parsec pretty - process random recaptcha safe SHA skylighting split syb tagsoup - text time uri-bytestring url utf8-string uuid xhtml xml xml-conduit - xml-types xss-sanitize zlib - ]; - executableHaskellDepends = [ - base bytestring directory filepath hslogger HTTP mtl network - network-uri syb text url utf8-string - ]; - description = "Wiki using happstack, git or darcs, and pandoc"; - license = "GPL"; - maintainers = with lib.maintainers; [ sternenseemann ]; - }) {}; - - "gitit_0_15_0_0" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-html , bytestring, ConfigFile, containers, directory, doctemplates, feed , filepath, filestore, ghc, ghc-paths, happstack-server, hoauth2 @@ -113669,7 +113632,6 @@ self: { ]; description = "Wiki using happstack, git or darcs, and pandoc"; license = "GPL"; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ sternenseemann ]; }) {};