From 66c2df9ee8d4540bdf370c46cb033079fb4af5df Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 Nov 2019 06:33:08 +0100 Subject: gnu: withershins: Build. * gnu/packages/code.scm (withershins)[arguments]: Don't treat compiler warnings as errors. --- gnu/packages/code.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/code.scm') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 512ca5d365..62bca01221 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -332,6 +332,9 @@ features that are not supported by the standard @code{stdio} implementation.") (build-system cmake-build-system) (arguments `(#:out-of-source? #f + #:configure-flags + ;; XXX A (justified!) misleading-indentation error breaks the build. + (list "-DENABLE_WERROR=OFF") #:phases (modify-phases %standard-phases (add-after -- cgit v1.2.3 From 3dd14ea73cb00280b9ca5d5ea32f25651c52b8db Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 Nov 2019 06:38:04 +0100 Subject: gnu: withershins: Don't use unstable tarball. * gnu/packages/code.scm (withershins)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/code.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu/packages/code.scm') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 62bca01221..f0943c6990 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -320,15 +320,15 @@ features that are not supported by the standard @code{stdio} implementation.") (package (name "withershins") (version "0.1") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/cameronwhite/withershins/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "08z3lyvswx7sad10637vfpwglbcbgzzcpfihw0x8lzr74f3b70bh")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cameronwhite/withershins.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1cviqvbbcwljm1zx12j6511hazr3kscwrvcyifrkfi4fpy5z985m")))) (build-system cmake-build-system) (arguments `(#:out-of-source? #f -- cgit v1.2.3 From 104264cd3a49fab79cdb55585922e6694e109b17 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 Nov 2019 06:18:36 +0100 Subject: gnu: makefile2graph: Don't use unstable tarball. * gnu/packages/code.scm (makefile2graph)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/code.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gnu/packages/code.scm') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index f0943c6990..67a2f80a00 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -515,14 +515,15 @@ produce colored output.") (package (name "makefile2graph") (version "1.5.0") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/lindenb/" name - "/archive/v" version ".tar.gz")) - (sha256 - (base32 - "0h1vchkpmm9h6s87p5nf0ksjxcmsxpx8k62a508w428n570wcr4l")) - (file-name (string-append name "-" version ".tar.gz")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lindenb/makefile2graph.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gjfk3d8qg3cla7qd2y7r9s03whlfwy83q8k76xfcnqrjjfavdgk")))) (build-system gnu-build-system) (arguments '(#:test-target "test" -- cgit v1.2.3 From 213c32e4b231b767458658bdfd673a9832a73a81 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 Nov 2019 06:27:09 +0100 Subject: gnu: colormake: Don't use unstable tarball. * gnu/packages/code.scm (colormake)[source]: Use GIT-FETCH and GIT-FILE-NAME. [native-inputs]: Remove gzip and tar. [arguments]: Copy the source checkout instead of extracting the source tarball. --- gnu/packages/code.scm | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'gnu/packages/code.scm') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 67a2f80a00..2b858c4719 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -461,30 +461,24 @@ importantly we give you proper follow-symbol and find-references support.") (version "0.9.20140503") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/pagekite/Colormake/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/pagekite/Colormake.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "08ldss9zd8ls6bjahvxhffpsjcysifr720yf3jz9db2mlklzmyd3")))) + (base32 "1f9v5s0viq4yc9iv6701h3pv7j21zz1ckl37lpp9hsnliiizv03p")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) - ("gzip" ,gzip) - ("perl" ,perl) - ("tar" ,tar))) + ("perl" ,perl))) (arguments `(#:modules ((guix build utils)) #:builder (begin (use-modules (guix build utils)) - ;; bootstrap - (setenv "PATH" (string-append - (assoc-ref %build-inputs "tar") "/bin" ":" - (assoc-ref %build-inputs "gzip") "/bin")) - (invoke "tar" "xvf" (assoc-ref %build-inputs "source")) - (chdir (string-append (string-capitalize ,name) "-" ,version)) + (copy-recursively (assoc-ref %build-inputs "source") "source") + (chdir "source") (patch-shebang "colormake.pl" (list (string-append (assoc-ref %build-inputs "perl") "/bin"))) -- cgit v1.2.3 From 0e564b5e18154fe5450a62ccb583591919b46286 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 Nov 2019 06:29:05 +0100 Subject: gnu: colormake: Use HTTPS home page. * gnu/packages/code.scm (colormake)[home-page]: Use HTTPS. --- gnu/packages/code.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/code.scm') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 2b858c4719..20726cfebc 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -499,7 +499,7 @@ importantly we give you proper follow-symbol and find-references support.") "clmake-short" "colormake.pl") bin) #t)))) - (home-page "http://bre.klaki.net/programs/colormake/") + (home-page "https://bre.klaki.net/programs/colormake/") (synopsis "Wrapper around @command{make} to produce colored output") (description "This package provides a wrapper around @command{make} to produce colored output.") -- cgit v1.2.3