commit d9cbb54b1f412ba8f9304c40abc9c68481c51301 · pyrox.dev/nixpkgs

pkgs/development/haskell-modules/configuration-common.nix

···

       2177
        
           '';

     

       2178
        
         }) super.linear-base;

     

       2179
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       2180
        
       } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

···

       2177
        
           '';

     

       2178
        
         }) super.linear-base;

     

       2179
        
       

     

       2180
       +
         # Fixes compilation with GHC 9.0 and above

     

       2181
       +
         # https://hub.darcs.net/shelarcy/regex-compat-tdfa/issue/3

     

       2182
       +
         regex-compat-tdfa = appendPatches [

     

       2183
       +
           ./patches/regex-compat-tdfa-ghc-9.0.patch

     

       2184
       +
         ] super.regex-compat-tdfa;

     

       2185
       +
       

     

       2186
        
       } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

+19

pkgs/development/haskell-modules/patches/regex-compat-tdfa-ghc-9.0.patch

···

       1
       +
       diff -rN -u old-regex-compat-tdfa/Text/Regex.hs new-regex-compat-tdfa/Text/Regex.hs

     

       2
       +
       --- old-regex-compat-tdfa/Text/Regex.hs	2022-02-20 13:42:36.828752458 +0100

     

       3
       +
       +++ new-regex-compat-tdfa/Text/Regex.hs	2022-02-20 13:42:36.828752458 +0100

     

       4
       +
       @@ -139,7 +139,7 @@

     

       5
       +
        splitRegex :: Regex -> String -> [String]

     

       6
       +
        splitRegex _ [] = []

     

       7
       +
        splitRegex delim strIn = 

     

       8
       +
       -  let matches = map (!0) (matchAll delim strIn)

     

       9
       +
       +  let matches = map (! 0) (matchAll delim strIn)

     

       10
       +
              go _i str [] = str : []

     

       11
       +
              go i str ((off,len):rest) =

     

       12
       +
                let i' = off+len

     

       13
       +
       @@ -194,4 +194,4 @@

     

       14
       +
                            then [firstline,""]

     

       15
       +
                            else firstline : loop remainder

     

       16
       +
        

     

       17
       +
       --}

     

       18
       +
       \ No newline at end of file

     

       19
       +
       +-}