diff options
-rw-r--r-- | Makefile.am | 36 | ||||
-rw-r--r-- | doc/guix.texi | 5 | ||||
-rw-r--r-- | gnu/ci.scm | 2 | ||||
-rw-r--r-- | gnu/local.mk | 1 | ||||
-rw-r--r-- | gnu/packages/golang.scm | 3 | ||||
-rw-r--r-- | gnu/packages/syndication.scm | 33 |
6 files changed, 28 insertions, 52 deletions
diff --git a/Makefile.am b/Makefile.am index 4940fd739c..0b733108d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -144,50 +144,51 @@ MODULES = \ guix/platforms/riscv.scm \ guix/platforms/x86.scm \ guix/build-system.scm \ - guix/build-system/agda.scm \ + guix/build-system/agda.scm \ guix/build-system/android-ndk.scm \ guix/build-system/ant.scm \ + guix/build-system/asdf.scm \ guix/build-system/cargo.scm \ - guix/build-system/channel.scm \ - guix/build-system/chicken.scm \ - guix/build-system/clojure.scm \ + guix/build-system/channel.scm \ + guix/build-system/chicken.scm \ + guix/build-system/clojure.scm \ guix/build-system/cmake.scm \ + guix/build-system/copy.scm \ guix/build-system/dub.scm \ guix/build-system/dune.scm \ guix/build-system/elm.scm \ guix/build-system/emacs.scm \ guix/build-system/font.scm \ - guix/build-system/go.scm \ - guix/build-system/meson.scm \ - guix/build-system/mozilla.scm \ - guix/build-system/minify.scm \ - guix/build-system/minetest.scm \ - guix/build-system/asdf.scm \ - guix/build-system/copy.scm \ guix/build-system/glib-or-gtk.scm \ guix/build-system/gnu.scm \ + guix/build-system/go.scm \ guix/build-system/guile.scm \ - guix/build-system/haskell.scm \ + guix/build-system/haskell.scm \ guix/build-system/julia.scm \ guix/build-system/linux-module.scm \ guix/build-system/maven.scm \ + guix/build-system/meson.scm \ + guix/build-system/minetest.scm \ + guix/build-system/minify.scm \ + guix/build-system/mix.scm \ + guix/build-system/mozilla.scm \ guix/build-system/node.scm \ + guix/build-system/ocaml.scm \ guix/build-system/perl.scm \ guix/build-system/pyproject.scm \ guix/build-system/python.scm \ - guix/build-system/renpy.scm \ - guix/build-system/ocaml.scm \ guix/build-system/qt.scm \ - guix/build-system/waf.scm \ guix/build-system/r.scm \ guix/build-system/rakudo.scm \ guix/build-system/rebar.scm \ + guix/build-system/renpy.scm \ guix/build-system/ruby.scm \ guix/build-system/scons.scm \ - guix/build-system/texlive.scm \ + guix/build-system/texlive.scm \ guix/build-system/tree-sitter.scm \ - guix/build-system/trivial.scm \ + guix/build-system/trivial.scm \ guix/build-system/vim.scm \ + guix/build-system/waf.scm \ guix/build-system/zig.scm \ guix/ftp-client.scm \ guix/http-client.scm \ @@ -232,6 +233,7 @@ MODULES = \ guix/build/guile-build-system.scm \ guix/build/maven-build-system.scm \ guix/build/minetest-build-system.scm \ + guix/build/mix-build-system.scm \ guix/build/node-build-system.scm \ guix/build/perl-build-system.scm \ guix/build/pyproject-build-system.scm \ diff --git a/doc/guix.texi b/doc/guix.texi index e61a893af9..7d7697d318 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -45875,6 +45875,11 @@ This optional string field is only relevant if the kernel is Linux. In that case, it corresponds to the ARCH variable used when building Linux, @code{"mips"} for instance. +@item @code{rust-target} (default: @code{#false}) +This optional string field is used to determine which rust target is best +supported by this platform. For example, the base level system targeted by +@code{armhf-linux} system is closest to @code{armv7-unknown-linux-gnueabihf}. + @item @code{glibc-dynamic-linker} This field is the name of the GNU C Library dynamic linker for the corresponding system, as a string. It can be diff --git a/gnu/ci.scm b/gnu/ci.scm index 38dc4d1d5c..6ee8499728 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -373,7 +373,7 @@ valid. Append SUFFIX to the job name." (define %x86-64-micro-architectures ;; Micro-architectures for which we build tuned variants. - '("westmere" "ivybridge" "haswell" "skylake" "skylake-avx512")) + '("haswell" "skylake" "x86-64-v2" "x86-64-v3" "x86-64-v4")) (define (tuned-package-jobs store package system) "Return a list of jobs for PACKAGE tuned for SYSTEM's micro-architectures." diff --git a/gnu/local.mk b/gnu/local.mk index c404d2f52f..ccc3c233bb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -245,6 +245,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/electronics.scm \ %D%/packages/elf.scm \ %D%/packages/elixir.scm \ + %D%/packages/elixir-xyz.scm \ %D%/packages/elm.scm \ %D%/packages/embedded.scm \ %D%/packages/emacs.scm \ diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index b5bf9d4b47..476edf6b4d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -472,7 +472,8 @@ in the style of communicating sequential processes (@dfn{CSP}).") `(("gold" ,binutils-gold))) (_ `())) ,@(package-native-inputs go-1.4))) - (supported-systems (delete "powerpc-linux" %supported-systems)))) + (supported-systems (fold delete %supported-systems + (list "powerpc-linux" "i586-gnu"))))) (define-public go-1.16 (package diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index f432709c19..a9e5b80bbf 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -43,7 +43,6 @@ #:use-module (gnu packages cmake) #:use-module (gnu packages crates-io) #:use-module (gnu packages curl) - #:use-module (gnu packages documentation) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -336,38 +335,6 @@ file system, and many more features.") (license (list license:gpl2+ ; filter/* license:expat)))) ; everything else -(define-public newsboat-2.13 - (package - (inherit newsboat) - (version "2.13") - (source - (origin - (method url-fetch) - (uri (string-append "https://newsboat.org/releases/" version - "/newsboat-" version ".tar.xz")) - (sha256 - (base32 - "0pik1d98ydzqi6055vdbkjg5krwifbk2hy2f5jp5p1wcy2s16dn7")))) - (build-system gnu-build-system) - (native-inputs - `(,@(fold alist-delete (package-native-inputs newsboat) - '("asciidoctor" "openssl")) - ;; For building documentation. - ("asciidoc" ,asciidoc))) - (inputs - (modify-inputs (package-inputs newsboat) - (replace "json-c" json-c-0.13))) - (arguments - '(#:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure script - (add-after 'build 'build-documentation - (lambda _ - (invoke "make" "doc")))) - #:make-flags - (list (string-append "prefix=" (assoc-ref %outputs "out"))) - #:test-target "test")))) - (define-public liferea (package (name "liferea") |