[email protected] (GNU bug Tracking System) skribis: > We can already change Scotch and CMH to ‘git-fetch’ I think.
For Scotch, the ‘v6.1.0’ tag at gitlab.inria.fr provides different content than the tarball on gforge:
Nur en /tmp/scotch_6.1.0/: bin Nur en /tmp/scotch_6.1.0/doc/src/ptscotch: p.ps Nur en /gnu/store/h84nd9h3131l63y4rllvzpnk6q0dsaq2-scotch-6.1.0-checkout: .gitignore Nur en /gnu/store/h84nd9h3131l63y4rllvzpnk6q0dsaq2-scotch-6.1.0-checkout: .gitlab-ci.yml Nur en /tmp/scotch_6.1.0/: include Nur en /tmp/scotch_6.1.0/: lib diff -ru /tmp/scotch_6.1.0/src/libscotch/library.h /gnu/store/h84nd9h3131l63y4rllvzpnk6q0dsaq2-scotch-6.1.0-checkout/src/libscotch/library.h --- /tmp/scotch_6.1.0/src/libscotch/library.h 1970-01-01 01:00:01.000000000 +0100 +++ /gnu/store/h84nd9h3131l63y4rllvzpnk6q0dsaq2-scotch-6.1.0-checkout/src/libscotch/library.h 1970-01-01 01:00:01.000000000 +0100 @@ -67,8 +67,6 @@ /*+ Integer type. +*/ -#include <stdint.h> - typedef DUMMYIDX SCOTCH_Idx; typedef DUMMYINT SCOTCH_Num; diff -ru /tmp/scotch_6.1.0/src/libscotch/Makefile /gnu/store/h84nd9h3131l63y4rllvzpnk6q0dsaq2-scotch-6.1.0-checkout/src/libscotch/Makefile --- /tmp/scotch_6.1.0/src/libscotch/Makefile 1970-01-01 01:00:01.000000000 +0100 +++ /gnu/store/h84nd9h3131l63y4rllvzpnk6q0dsaq2-scotch-6.1.0-checkout/src/libscotch/Makefile 1970-01-01 01:00:01.000000000 +0100 @@ -2320,28 +2320,6 @@ common.h \ scotch.h -library_graph_diam$(OBJ) : library_graph_diam.c \ - module.h \ - common.h \ - graph.h \ - scotch.h - -library_graph_diam_f$(OBJ) : library_graph_diam.c \ - module.h \ - common.h \ - scotch.h - -library_graph_induce$(OBJ) : library_graph_diam.c \ - module.h \ - common.h \ - graph.h \ - scotch.h - -library_graph_induce_f$(OBJ) : library_graph_diam.c \ - module.h \ - common.h \ - scotch.h - library_graph_io_chac$(OBJ) : library_graph_io_chac.c \ module.h \ common.h \ diff -ru /tmp/scotch_6.1.0/src/libscotchmetis/library_metis.h /gnu/store/h84nd9h3131l63y4rllvzpnk6q0dsaq2-scotch-6.1.0-checkout/src/libscotchmetis/library_metis.h --- /tmp/scotch_6.1.0/src/libscotchmetis/library_metis.h 1970-01-01 01:00:01.000000000 +0100 +++ /gnu/store/h84nd9h3131l63y4rllvzpnk6q0dsaq2-scotch-6.1.0-checkout/src/libscotchmetis/library_metis.h 1970-01-01 01:00:01.000000000 +0100 @@ -106,7 +106,6 @@ */ #ifndef SCOTCH_H /* In case "scotch.h" not included before */ -#include <stdint.h> typedef DUMMYINT SCOTCH_Num; #endif /* SCOTCH_H */ diff -ru /tmp/scotch_6.1.0/src/libscotchmetis/library_parmetis.h /gnu/store/h84nd9h3131l63y4rllvzpnk6q0dsaq2-scotch-6.1.0-checkout/src/libscotchmetis/library_parmetis.h --- /tmp/scotch_6.1.0/src/libscotchmetis/library_parmetis.h 1970-01-01 01:00:01.000000000 +0100 +++ /gnu/store/h84nd9h3131l63y4rllvzpnk6q0dsaq2-scotch-6.1.0-checkout/src/libscotchmetis/library_parmetis.h 1970-01-01 01:00:01.000000000 +0100 @@ -106,7 +106,6 @@ */ #ifndef SCOTCH_H /* In case "scotch.h" not included before */ -#include <stdint.h> typedef DUMMYINT SCOTCH_Num; #endif /* SCOTCH_H */
There’s not much we can do if upstream isn’t more cautious though. Perhaps we can still update to the “new” 6.1.0, maybe labeling it “6.1.0b”? Attached a tentative patch. Thanks, Ludo’.
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 7866bcc6eb..4f8f79052d 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2015 Fabian Harfert <[email protected]> ;;; Copyright © 2016 Roel Janssen <[email protected]> ;;; Copyright © 2016, 2018, 2020 Kei Kebreau <[email protected]> -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <[email protected]> +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <[email protected]> ;;; Copyright © 2016 Leo Famulari <[email protected]> ;;; Copyright © 2016, 2017 Thomas Danckaert <[email protected]> ;;; Copyright © 2017, 2018, 2019, 2020 Paul Garlick <[email protected]> @@ -3083,13 +3083,15 @@ implemented in ANSI C, and MPI for communications.") (package (name "scotch") (version "6.1.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://gforge.inria.fr/frs/download.php/"; - "latestfile/298/scotch_" version ".tar.gz")) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.inria.fr/scotch/scotch";) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "1184fcv4wa2df8szb5lan6pjh0raarr45pk8ilpvbz23naikzg53")) + (base32 + "164jqsy75j7zfnwngj10jc4060shhxni3z8ykklhqjykdrinir55")) (patches (search-patches "scotch-build-parallelism.patch" "scotch-integer-declarations.patch")))) (build-system gnu-build-system)
