From f431d5e299b9e00c22b02e9d5464e6d4196561ba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 14 Dec 2019 15:54:50 +0100 Subject: guix: Upgrade to Bioconductor 3.10. * guix/build-system/r.scm (bioconductor-uri): Switch to version 3.10. * guix/import/cran.scm (%bioconductor-version): Same. --- guix/build-system/r.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'guix/build-system') diff --git a/guix/build-system/r.scm b/guix/build-system/r.scm index dd2a9fe8de..2d328764b0 100644 --- a/guix/build-system/r.scm +++ b/guix/build-system/r.scm @@ -59,7 +59,7 @@ release corresponding to NAME and VERSION." "/src/contrib/" name "_" version ".tar.gz") ;; TODO: use %bioconductor-version from (guix import cran) - (string-append "https://bioconductor.org/packages/3.9" + (string-append "https://bioconductor.org/packages/3.10" type-url-part "/src/contrib/Archive/" name "_" version ".tar.gz")))) -- cgit v1.2.3 From fce8ec9e1514a25f3698553449635a2fe5d80811 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 22 Dec 2019 20:31:40 +0100 Subject: build-system: qt: Actually use qt-build-system, not cmake-build-system. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the qt-build-system was created, based on the cmake-build-system, some references to cmake have been missed to be changed. * guix/build-system/qt.scm (qt-build, qt-cross-build)[modules]: Use qt-build-system, not cmake-build-system. [builder]: Call qt-build, not cmake-build. Coauthored-by: Ludovic Courtès --- guix/build-system/qt.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'guix/build-system') diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm index b776845377..67fdfa1230 100644 --- a/guix/build-system/qt.scm +++ b/guix/build-system/qt.scm @@ -126,14 +126,14 @@ (qt-wrap-excluded-outputs ''()) (system (%current-system)) (imported-modules %qt-build-system-modules) - (modules '((guix build cmake-build-system) + (modules '((guix build qt-build-system) (guix build utils)))) "Build SOURCE using CMAKE, and with INPUTS. This assumes that SOURCE provides a 'CMakeLists.txt' file as its build system." (define builder `(begin (use-modules ,@modules) - (cmake-build #:source ,(match (assoc-ref inputs "source") + (qt-build #:source ,(match (assoc-ref inputs "source") (((? derivation? source)) (derivation->output-path source)) ((source) @@ -208,7 +208,7 @@ provides a 'CMakeLists.txt' file as its build system." (system (%current-system)) (build (nix-system->gnu-triplet system)) (imported-modules %qt-build-system-modules) - (modules '((guix build cmake-build-system) + (modules '((guix build qt-build-system) (guix build utils)))) "Cross-build NAME using CMAKE for TARGET, where TARGET is a GNU triplet and with INPUTS. This assumes that SOURCE provides a 'CMakeLists.txt' file as its @@ -237,7 +237,7 @@ build system." `(,name . ,path))) target-drvs)) - (cmake-build #:source ,(match (assoc-ref native-drvs "source") + (qt-build #:source ,(match (assoc-ref native-drvs "source") (((? derivation? source)) (derivation->output-path source)) ((source) -- cgit v1.2.3 From c19260ea00dae351352364705ab6d2680f815847 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 23 Dec 2019 15:48:21 +0100 Subject: build-system: qt: Adjust indentation. * guix/build-system/qt.scm (qt-build, qt-cross-build): Adjust indentation. --- guix/build-system/qt.scm | 210 +++++++++++++++++++++++------------------------ 1 file changed, 105 insertions(+), 105 deletions(-) (limited to 'guix/build-system') diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm index 67fdfa1230..118022ec45 100644 --- a/guix/build-system/qt.scm +++ b/guix/build-system/qt.scm @@ -106,60 +106,60 @@ (define* (qt-build store name inputs - #:key (guile #f) - (outputs '("out")) (configure-flags ''()) - (search-paths '()) - (make-flags ''()) - (out-of-source? #t) - (build-type "RelWithDebInfo") - (tests? #t) - (test-target "test") - (parallel-build? #t) (parallel-tests? #f) - (validate-runpath? #t) - (patch-shebangs? #t) - (strip-binaries? #t) - (strip-flags ''("--strip-debug")) - (strip-directories ''("lib" "lib64" "libexec" - "bin" "sbin")) - (phases '(@ (guix build qt-build-system) - %standard-phases)) - (qt-wrap-excluded-outputs ''()) - (system (%current-system)) - (imported-modules %qt-build-system-modules) - (modules '((guix build qt-build-system) - (guix build utils)))) + #:key (guile #f) + (outputs '("out")) (configure-flags ''()) + (search-paths '()) + (make-flags ''()) + (out-of-source? #t) + (build-type "RelWithDebInfo") + (tests? #t) + (test-target "test") + (parallel-build? #t) (parallel-tests? #f) + (validate-runpath? #t) + (patch-shebangs? #t) + (strip-binaries? #t) + (strip-flags ''("--strip-debug")) + (strip-directories ''("lib" "lib64" "libexec" + "bin" "sbin")) + (phases '(@ (guix build qt-build-system) + %standard-phases)) + (qt-wrap-excluded-outputs ''()) + (system (%current-system)) + (imported-modules %qt-build-system-modules) + (modules '((guix build qt-build-system) + (guix build utils)))) "Build SOURCE using CMAKE, and with INPUTS. This assumes that SOURCE provides a 'CMakeLists.txt' file as its build system." (define builder `(begin (use-modules ,@modules) (qt-build #:source ,(match (assoc-ref inputs "source") - (((? derivation? source)) - (derivation->output-path source)) - ((source) - source) - (source - source)) - #:system ,system - #:outputs %outputs - #:inputs %build-inputs - #:search-paths ',(map search-path-specification->sexp - search-paths) - #:phases ,phases - #:qt-wrap-excluded-outputs ,qt-wrap-excluded-outputs - #:configure-flags ,configure-flags - #:make-flags ,make-flags - #:out-of-source? ,out-of-source? - #:build-type ,build-type - #:tests? ,tests? - #:test-target ,test-target - #:parallel-build? ,parallel-build? - #:parallel-tests? ,parallel-tests? - #:validate-runpath? ,validate-runpath? - #:patch-shebangs? ,patch-shebangs? - #:strip-binaries? ,strip-binaries? - #:strip-flags ,strip-flags - #:strip-directories ,strip-directories))) + (((? derivation? source)) + (derivation->output-path source)) + ((source) + source) + (source + source)) + #:system ,system + #:outputs %outputs + #:inputs %build-inputs + #:search-paths ',(map search-path-specification->sexp + search-paths) + #:phases ,phases + #:qt-wrap-excluded-outputs ,qt-wrap-excluded-outputs + #:configure-flags ,configure-flags + #:make-flags ,make-flags + #:out-of-source? ,out-of-source? + #:build-type ,build-type + #:tests? ,tests? + #:test-target ,test-target + #:parallel-build? ,parallel-build? + #:parallel-tests? ,parallel-tests? + #:validate-runpath? ,validate-runpath? + #:patch-shebangs? ,patch-shebangs? + #:strip-binaries? ,strip-binaries? + #:strip-flags ,strip-flags + #:strip-directories ,strip-directories))) (define guile-for-build (match guile @@ -183,33 +183,33 @@ provides a 'CMakeLists.txt' file as its build system." ;;; (define* (qt-cross-build store name - #:key - target native-drvs target-drvs - (guile #f) - (outputs '("out")) - (configure-flags ''()) - (search-paths '()) - (native-search-paths '()) - (make-flags ''()) - (out-of-source? #t) - (build-type "RelWithDebInfo") - (tests? #f) ; nothing can be done - (test-target "test") - (parallel-build? #t) (parallel-tests? #f) - (validate-runpath? #t) - (patch-shebangs? #t) - (strip-binaries? #t) - (strip-flags ''("--strip-debug" - "--enable-deterministic-archives")) - (strip-directories ''("lib" "lib64" "libexec" - "bin" "sbin")) - (phases '(@ (guix build qt-build-system) + #:key + target native-drvs target-drvs + (guile #f) + (outputs '("out")) + (configure-flags ''()) + (search-paths '()) + (native-search-paths '()) + (make-flags ''()) + (out-of-source? #t) + (build-type "RelWithDebInfo") + (tests? #f) ; nothing can be done + (test-target "test") + (parallel-build? #t) (parallel-tests? #f) + (validate-runpath? #t) + (patch-shebangs? #t) + (strip-binaries? #t) + (strip-flags ''("--strip-debug" + "--enable-deterministic-archives")) + (strip-directories ''("lib" "lib64" "libexec" + "bin" "sbin")) + (phases '(@ (guix build qt-build-system) %standard-phases)) - (system (%current-system)) - (build (nix-system->gnu-triplet system)) - (imported-modules %qt-build-system-modules) - (modules '((guix build qt-build-system) - (guix build utils)))) + (system (%current-system)) + (build (nix-system->gnu-triplet system)) + (imported-modules %qt-build-system-modules) + (modules '((guix build qt-build-system) + (guix build utils)))) "Cross-build NAME using CMAKE for TARGET, where TARGET is a GNU triplet and with INPUTS. This assumes that SOURCE provides a 'CMakeLists.txt' file as its build system." @@ -238,37 +238,37 @@ build system." target-drvs)) (qt-build #:source ,(match (assoc-ref native-drvs "source") - (((? derivation? source)) - (derivation->output-path source)) - ((source) - source) - (source - source)) - #:system ,system - #:build ,build - #:target ,target - #:outputs %outputs - #:inputs %build-target-inputs - #:native-inputs %build-host-inputs - #:search-paths ',(map search-path-specification->sexp - search-paths) - #:native-search-paths ',(map - search-path-specification->sexp - native-search-paths) - #:phases ,phases - #:configure-flags ,configure-flags - #:make-flags ,make-flags - #:out-of-source? ,out-of-source? - #:build-type ,build-type - #:tests? ,tests? - #:test-target ,test-target - #:parallel-build? ,parallel-build? - #:parallel-tests? ,parallel-tests? - #:validate-runpath? ,validate-runpath? - #:patch-shebangs? ,patch-shebangs? - #:strip-binaries? ,strip-binaries? - #:strip-flags ,strip-flags - #:strip-directories ,strip-directories)))) + (((? derivation? source)) + (derivation->output-path source)) + ((source) + source) + (source + source)) + #:system ,system + #:build ,build + #:target ,target + #:outputs %outputs + #:inputs %build-target-inputs + #:native-inputs %build-host-inputs + #:search-paths ',(map search-path-specification->sexp + search-paths) + #:native-search-paths ',(map + search-path-specification->sexp + native-search-paths) + #:phases ,phases + #:configure-flags ,configure-flags + #:make-flags ,make-flags + #:out-of-source? ,out-of-source? + #:build-type ,build-type + #:tests? ,tests? + #:test-target ,test-target + #:parallel-build? ,parallel-build? + #:parallel-tests? ,parallel-tests? + #:validate-runpath? ,validate-runpath? + #:patch-shebangs? ,patch-shebangs? + #:strip-binaries? ,strip-binaries? + #:strip-flags ,strip-flags + #:strip-directories ,strip-directories)))) (define guile-for-build (match guile -- cgit v1.2.3 From 87a028100c665814c3b5d622701abc6d77144faf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 26 Dec 2019 10:02:56 +0200 Subject: build-system: linux-module: Add substitutable keyword. * guix/build-system/linux-module.scm (linux-module-build) Add substitutable keyword. --- guix/build-system/linux-module.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'guix/build-system') diff --git a/guix/build-system/linux-module.scm b/guix/build-system/linux-module.scm index 6084d22210..ba76ab85c3 100644 --- a/guix/build-system/linux-module.scm +++ b/guix/build-system/linux-module.scm @@ -126,6 +126,7 @@ (outputs '("out")) (system (%current-system)) (guile #f) + (substitutable? #t) (imported-modules %linux-module-build-system-modules) (modules '((guix build linux-module-build-system) @@ -164,7 +165,8 @@ #:inputs inputs #:modules imported-modules #:outputs outputs - #:guile-for-build guile-for-build)) + #:guile-for-build guile-for-build + #:substitutable? substitutable?)) (define linux-module-build-system (build-system -- cgit v1.2.3