On Sat, Apr 09, 2016 at 12:54:43PM +0200, Mathieu Lirzin wrote: > Leo Famulari <l...@famulari.name> writes: > > > On Fri, Apr 08, 2016 at 12:18:15PM +0200, Mathieu Lirzin wrote: > >> Roel Janssen <r...@gnu.org> writes: > >> > >> > Strangely enough, I couldn't apply it either. I don't know what > >> > happened.. I regenerated the patch, and now I was able to apply it to > >> > my source tree. Hopefully it works for you too now. > >> > >> This problem has already happened to me last year. I suspect it is/was a > >> bug in Git. > > > > I've attached the diffoscope report (HTML) between the first two patches > > in this thread. > > Do you mean “attached” like in email attachment? If so then I don't see > the attachment...
Gah, I do that all the time! :p Here it is...Title: /gnu/store/6ycn54hnwkvm95ybiiyksa3f19v10gny-diffoscope-51/bin/.diffoscope-real --html report.html good bad
good vs.
bad
¶
| Offset 1, 22 lines modified | Offset 1, 22 lines modified | ||
| 1 |
From· |
1 | From·558175f69ba52446eca75ab79b641c8f0204093e·Mon·Sep·17·00:00:00·2001 |
| 2 | From:·Roel·Janssen·<roel@gnu.org> | 2 | From:·Roel·Janssen·<roel@gnu.org> |
| 3 |
Date:·Thu,·7·Apr·2016· |
3 | Date:·Thu,·7·Apr·2016·13:22:35·+0200 |
| 4 | Subject:·[PATCH]·gnu:·Add·nlopt. | 4 | Subject:·[PATCH]·gnu:·Add·nlopt. |
| 5 | *·gnu/packages/maths.scm·(nlopt):·New·variable. | 5 | *·gnu/packages/maths.scm·(nlopt):·New·variable. |
| 6 | --- | 6 | --- |
| 7 | ·gnu/packages/maths.scm·|·20·++++++++++++++++++++ | 7 | ·gnu/packages/maths.scm·|·20·++++++++++++++++++++ |
| 8 | ·1·file·changed,·20·insertions(+) | 8 | ·1·file·changed,·20·insertions(+) |
| 9 | diff·--git·a/gnu/packages/maths.scm·b/gnu/packages/maths.scm | 9 | diff·--git·a/gnu/packages/maths.scm·b/gnu/packages/maths.scm |
| 10 |
index·adebf09.. |
10 | index·adebf09..6b9d79d·100644 |
| 11 | ---·a/gnu/packages/maths.scm | 11 | ---·a/gnu/packages/maths.scm |
| 12 | +++·b/gnu/packages/maths.scm | 12 | +++·b/gnu/packages/maths.scm |
| 13 |
@@·-911, |
13 | @@·-911,7·+911,26·@@·sparse·system·of·linear·equations·A·x·=·b·using·Guassian·elimination.") |
| 14 | ·····(inputs | 14 | ·····(inputs |
| 15 | ······(alist-delete·"pt-scotch"·(package-inputs·mumps-openmpi))))) | 15 | ······(alist-delete·"pt-scotch"·(package-inputs·mumps-openmpi))))) |
| 16 | · | 16 | · |
| 17 | +(define-public·nlopt | 17 | +(define-public·nlopt |
| 18 | +··(package | 18 | +··(package |
| 19 | +····(name·"nlopt") | 19 | +····(name·"nlopt") |
| 20 | +····(version·"2.4.2") | 20 | +····(version·"2.4.2") |
| Offset 27, 18 lines modified | Offset 27, 18 lines modified | ||
| 27 | +······(sha256 | 27 | +······(sha256 |
| 28 | +·······(base32·"12cfkkhcdf4zmb6h7y6qvvdvqjs2xf9sjpa3rl3bq76px4yn76c0")))) | 28 | +·······(base32·"12cfkkhcdf4zmb6h7y6qvvdvqjs2xf9sjpa3rl3bq76px4yn76c0")))) |
| 29 | +····(build-system·gnu-build-system) | 29 | +····(build-system·gnu-build-system) |
| 30 | +····(arguments | 30 | +····(arguments |
| 31 | +·····`(#:configure-flags·'("--enable-shared")))·;·Also·create·a·shared·library. | 31 | +·····`(#:configure-flags·'("--enable-shared")))·;·Also·create·a·shared·library. |
| 32 | +····(home-page·"http://ab-initio.mit.edu/wiki/") | 32 | +····(home-page·"http://ab-initio.mit.edu/wiki/") |
| 33 | +····(synopsis·"Library·for·non-linear·optimization") | 33 | +····(synopsis·"Library·for·non-linear·optimization") |
| 34 | +····(description·"NLopt·is·a·library·for·nonlinear·optimization,·providing·a | 34 | +····(description·"NLopt·is·a·library·for·non-linear·optimization,·providing·a |
| 35 | +common·interface·for·a·number·of·different·free·optimization·routines·available | 35 | +common·interface·for·a·number·of·different·free·optimization·routines·available |
| 36 | +online·as·well·as·original·implementations·of·various·other·algorithms.") | 36 | +online·as·well·as·original·implementations·of·various·other·algorithms.") |
| 37 |
+····(license·license:lgpl |
37 | +····(license·license:lgpl3))) |
| 38 | + | 38 | + |
| 39 | ·(define-public·superlu | 39 | ·(define-public·superlu |
| 40 | ···(package | 40 | ···(package |
| 41 | ·····(name·"superlu") | 41 | ·····(name·"superlu") |
| 42 | --· | 42 | --· |
| 43 | 2.5.5 | 43 | 2.5.5 |
