diff options
| author | Maxim Cournoyer <[email protected]> | 2023-02-08 09:41:45 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2023-02-08 09:41:45 -0500 |
| commit | d88cee1d44a475b6ea276e87a4c98682255b881e (patch) | |
| tree | f2e681b5211840d4eef688120041c2dd730002cc /gnu/packages/haskell.scm | |
| parent | d2b9b4b861b71d11eaeaa12fe544c9ffb0b6644d (diff) | |
| parent | 20059f92a97726b40d4d74e67463a64c98d1da0d (diff) | |
Merge branch 'master' into staging.
With conflicts resolved in:
gnu/packages/version-control.scm
Diffstat (limited to 'gnu/packages/haskell.scm')
| -rw-r--r-- | gnu/packages/haskell.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 91610a1f2e..4eb13f76d7 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1143,7 +1143,7 @@ interactive environment for the functional language Haskell.") (sha256 (base32 "0c55pj2820q26rikhpf636sn4mjgqsxjrl94vsywrh79dxp3k14z")))) - ("git" ,git-minimal/fixed) ; invoked during tests + ("git" ,git-minimal/pinned) ; invoked during tests ,@(filter (match-lambda (("ghc-bootstrap" . _) #f) (("ghc-testsuite" . _) #f) @@ -1195,7 +1195,7 @@ interactive environment for the functional language Haskell.") (sha256 (base32 "1zl25gg6bpx5601k8h3cqnns1xfc0nqgwnh8jvn2s65ra3f2g1nz")))) - ("git" ,git-minimal/fixed) ; invoked during tests + ("git" ,git-minimal/pinned) ; invoked during tests ,@(filter (match-lambda (("ghc-bootstrap" . _) #f) (("ghc-testsuite" . _) #f) |