diff --git a/.dir-locals.el b/.dir-locals.el index 3f1d292a199..022a338217e 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -606,7 +606,6 @@ (eval . (put 'restic-backup-job 'scheme-indent-function 0)) (eval . (put 'rngd-configuration 'scheme-indent-function 0)) (eval . (put 'rootless-podman-configuration 'scheme-indent-function 0)) - (eval . (put 'rottlog-configuration 'scheme-indent-function 0)) (eval . (put 'rpcbind-configuration 'scheme-indent-function 0)) (eval . (put 'rshiny-configuration 'scheme-indent-function 0)) (eval . (put 'rspamd-configuration 'scheme-indent-function 0)) diff --git a/doc/guix.texi b/doc/guix.texi index 86b6aec2bbf..3fd2a139685 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -21476,7 +21476,6 @@ is also prefixed by a timestamp by GNU Shepherd. @node Log Rotation @subsection Log Rotation -@cindex rottlog @cindex log rotation @cindex logging Log files such as those found in @file{/var/log} tend to grow endlessly, @@ -21557,119 +21556,6 @@ Size in bytes below which a log file is @emph{not} rotated. @c %end of fragment -@subheading Rottlog - -An alternative log rotation service relying on GNU@tie{}Rot[t]log, a log -rotation tool (@pxref{Top,,, rottlog, GNU Rot[t]log Manual}), is also -provided. - -@quotation Warning -The Rottlog service presented here is deprecated in favor of -@code{log-rotation-service-type} (see above). The -@code{rottlog-service-type} variable and related tools will be removed -after 2025-06-15. -@end quotation - -The example below shows how to extend it with an additional -@dfn{rotation}, should you need to do that (usually, services that -produce log files already take care of that): - -@lisp -(use-modules (guix) (gnu)) -(use-service-modules admin) - -(define my-log-files - ;; Log files that I want to rotate. - '("/var/log/something.log" "/var/log/another.log")) - -(operating-system - ;; @dots{} - (services (cons (simple-service 'rotate-my-stuff - rottlog-service-type - (list (log-rotation - (frequency 'daily) - (files my-log-files)))) - %base-services))) -@end lisp - -@defvar rottlog-service-type -This is the type of the Rottlog service, whose value is a -@code{rottlog-configuration} object. - -Other services can extend this one with new @code{log-rotation} objects -(see below), thereby augmenting the set of files to be rotated. - -This service type can define mcron jobs (@pxref{Scheduled Job -Execution}) to run the rottlog service. -@end defvar - -@deftp {Data Type} rottlog-configuration -Data type representing the configuration of rottlog. - -@table @asis -@item @code{rottlog} (default: @code{rottlog}) -The Rottlog package to use. - -@item @code{rc-file} (default: @code{(file-append rottlog "/etc/rc")}) -The Rottlog configuration file to use (@pxref{Mandatory RC Variables,,, -rottlog, GNU Rot[t]log Manual}). - -@item @code{rotations} (default: @code{%default-rotations}) -A list of @code{log-rotation} objects as defined below. - -@item @code{jobs} -This is a list of gexps where each gexp corresponds to an mcron job -specification (@pxref{Scheduled Job Execution}). -@end table -@end deftp - -@deftp {Data Type} log-rotation -Data type representing the rotation of a group of log files. - -Taking an example from the Rottlog manual (@pxref{Period Related File -Examples,,, rottlog, GNU Rot[t]log Manual}), a log rotation might be -defined like this: - -@lisp -(log-rotation - (frequency 'daily) - (files '("/var/log/apache/*")) - (options '("storedir apache-archives" - "rotate 6" - "notifempty" - "nocompress"))) -@end lisp - -The list of fields is as follows: - -@table @asis -@item @code{frequency} (default: @code{'weekly}) -The log rotation frequency, a symbol. - -@item @code{files} -The list of files or file glob patterns to rotate. - -@vindex %default-log-rotation-options -@item @code{options} (default: @code{%default-log-rotation-options}) -The list of rottlog options for this rotation (@pxref{Configuration -parameters,,, rottlog, GNU Rot[t]log Manual}). - -@item @code{post-rotate} (default: @code{#f}) -Either @code{#f} or a gexp to execute once the rotation has completed. -@end table -@end deftp - -@defvar %default-rotations -Specifies weekly rotation of @code{%rotated-files} and of -@file{/var/log/guix-daemon.log}. -@end defvar - -@defvar %rotated-files -The list of syslog-controlled files to be rotated. By default it is: -@code{'("/var/log/messages" "/var/log/secure" "/var/log/debug" \ -"/var/log/maillog")}. -@end defvar - Some log files just need to be deleted periodically once they are old, without any other criterion and without any archival step. This is the case of build logs stored by @command{guix-daemon} under diff --git a/gnu/local.mk b/gnu/local.mk index 3414c53a20d..2889c2e4bc5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -993,7 +993,6 @@ dist_patch_DATA = \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \ %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \ - %D%/packages/patches/aoflagger-use-system-provided-pybind11.patch \ %D%/packages/patches/apr-fix-atomics.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/aria-maestosa-scons-python3.patch \ @@ -2186,6 +2185,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-pytorch-system-libraries.patch \ %D%/packages/patches/python-pytorch-without-kineto.patch \ %D%/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch \ + %D%/packages/patches/python-scipy-i686.patch \ %D%/packages/patches/python-vaex-core-fix-tsl-use.patch \ %D%/packages/patches/python-vega-datasets-remove-la-riots-code.patch \ %D%/packages/patches/python-versioneer-guix-support.patch \ @@ -2238,6 +2238,7 @@ dist_patch_DATA = \ %D%/packages/patches/raptor2-libxml2.patch \ %D%/packages/patches/racket-rktio-bin-sh.patch \ %D%/packages/patches/re2c-Use-maximum-alignment.patch \ + %D%/packages/patches/readymedia-ffmpeg7.patch \ %D%/packages/patches/reduce-unbundle-libffi.patch \ %D%/packages/patches/remake-impure-dirs.patch \ %D%/packages/patches/restartd-update-robust.patch \ diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 4e67b747ed9..747c0ec1990 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -78,12 +78,14 @@ #:use-module (gnu packages golang) #:use-module (gnu packages golang-maths) #:use-module (gnu packages golang-xyz) + #:use-module (gnu packages gperf) #:use-module (gnu packages gps) #:use-module (gnu packages graph) #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages image-processing) + #:use-module (gnu packages imagemagick) #:use-module (gnu packages jupyter) #:use-module (gnu packages libevent) #:use-module (gnu packages libusb) @@ -190,8 +192,8 @@ randomly altered. (license license:gpl3))) (define-public aocommon - (let ((commit "9272ea36693a7ce7aa3524a9e212a60a509c3b8a") - (revision "2")) + (let ((commit "1444d66a59e757e7a0c74447e9f8d7a69c5e102d") + (revision "3")) (package (name "aocommon") (version (git-version "0.0.0" revision commit)) @@ -199,15 +201,16 @@ randomly altered. (origin (method git-fetch) (uri (git-reference - (url "https://gitlab.com/aroffringa/aocommon") - (commit commit))) + (url "https://gitlab.com/aroffringa/aocommon") + (commit commit))) (sha256 - (base32 "0klcrrlkc4sjpr83m2gnwb65lg798rydyvrlpangf7np1qg4zbk5")) + (base32 "06kdkkarx4bmp9808bwlx35vnp6g0vfzaxx1ijvzwgsjgg8yi5cp")) (file-name (git-file-name name version)))) (build-system copy-build-system) (arguments (list #:install-plan - #~'(("include/aocommon" "include/aocommon")))) + #~'(("include/aocommon" "include/aocommon") + ("CMake" "CMake")))) (home-page "https://gitlab.com/aroffringa/aocommon") (synopsis "Collection of functionality that is reused in astronomical applications") (description @@ -217,65 +220,67 @@ reused in several astronomical applications, such as @code{wsclean}, (license license:gpl3+)))) (define-public aoflagger - (package - (name "aoflagger") - (version "3.4.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/aroffringa/aoflagger") - (commit (string-append "v" version)))) - (sha256 - (base32 "0dxmcy04cayhs4s2z41wls1dnmg9hkffvlqcmc660idqziffvv1g")) - (patches - (search-patches "aoflagger-use-system-provided-pybind11.patch")) - (file-name (git-file-name name version)))) - (build-system cmake-build-system) - (arguments - (list - ;; Tests require external files download from - ;; https://www.astron.nl/citt/ci_data/aoflagger/ - #:tests? #f - #:configure-flags - #~(list (string-append "-DCASACORE_ROOT_DIR=" - #$(this-package-input "casacore"))) - #:phases - #~(modify-phases %standard-phases - ;; aocommon and pybind11 are expected to be found as git submodules, - ;; link them before build. - (add-after 'unpack 'link-submodule-package - (lambda _ - (rmdir "external/aocommon") - (symlink #$(this-package-native-input "aocommon") - (string-append (getcwd) "/external/aocommon"))))))) - (native-inputs - (list aocommon - boost - pkg-config - python - pybind11)) - (inputs - (list casacore - cfitsio - fftw - gsl - gtkmm-3 - hdf5 - libpng - libsigc++ - libxml2 - lua - openblas - zlib)) - (home-page "https://gitlab.com/aroffringa/aoflagger") - (synopsis "Astronomical tool that can find and remove radio-frequency interference") - (description - "AOFlagger is a tool that can find and remove radio-frequency + ;; 3.4.0 was released in 2023, there are a lot of changes and compatibility + ;; for EveryBeam. + (let ((commit "b3a459df54b35ec18821ae0a392eeef1ca92cdba") + (revision "0")) + (package + (name "aoflagger") + (version (git-version "3.4.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/aroffringa/aoflagger") + (commit commit))) + (sha256 + (base32 "0fgm2svdw52m348hi28pnknxsdy54dkfd7y388b14hwf9z5ransa")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + (list + ;; Tests require external files download from + ;; https://www.astron.nl/citt/ci_data/aoflagger/ + #:tests? #f + #:configure-flags + #~(list (string-append "-DCASACORE_ROOT_DIR=" + #$(this-package-input "casacore"))) + #:phases + #~(modify-phases %standard-phases + ;; aocommon and pybind11 are expected to be found as git submodules, + ;; link them before build. + (add-after 'unpack 'link-submodule-package + (lambda _ + (rmdir "external/aocommon") + (symlink #$(this-package-native-input "aocommon") + (string-append (getcwd) "/external/aocommon"))))))) + (native-inputs + (list aocommon + boost + pkg-config + python + pybind11)) + (inputs + (list casacore + cfitsio + fftw + gsl + gtkmm-3 + hdf5 + libpng + libsigc++ + libxml2 + lua + openblas + zlib)) + (home-page "https://gitlab.com/aroffringa/aoflagger") + (synopsis "Astronomical tool that can find and remove radio-frequency interference") + (description + "AOFlagger is a tool that can find and remove radio-frequency interference (RFI) in radio astronomical observations. It can make use of Lua scripts to make flagging strategies flexible, and the tools are applicable to a wide set of telescopes.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public astroterm (package @@ -537,67 +542,108 @@ Library with namespaces, exception handling, and member template functions.") "See License.txt in the distribution.")))) (define-public celestia - (package - (name "celestia") - (version "1.6.4") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/celestiaproject/celestia") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0nz9k5nd2zmrbwj1qhsfwmvqymqk8c4yjxpybck44isrild2ah9j")))) - (build-system gnu-build-system) - (arguments - (list - #:modules - `((guix build gnu-build-system) - (guix build utils) - (srfi srfi-1) - (srfi srfi-71)) - #:configure-flags - #~(list "--with-glut" - (string-append "--with-lua=" #$(this-package-input "lua"))) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-lua-version - (lambda _ - (let* ((_ version (package-name->name+version - #$(this-package-input "lua"))) - (components (string-split version #\.)) - (major+minor (string-join (take components 2) "."))) - (substitute* "configure.ac" - (("lua5.3") - (string-append "lua-" major+minor))))))))) - (native-inputs - (list autoconf - automake - gettext-minimal - libgit2 - libtool - perl - pkg-config)) - (inputs - (list freeglut - glu - libjpeg-turbo - libpng - libtheora - mesa)) - (propagated-inputs - (list lua)) - (home-page "https://celestia.space/") - (synopsis "Real-time 3D visualization of space") - (description - "This simulation program lets you explore our universe in three + ;; 1.6.4 was placed in 2023 while master migrated to Qt6, use the lates + ;; commit for now. + (let ((commit "d3f4040401f5f71bcca79e55d53be75c05b867ef") + (revision "0")) + (package + (name "celestia") + (version (git-version "1.6.4" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/celestiaproject/celestia") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0rqkzxyf8gfjprhj1c19d7chhc3b94wlq2119wz0c344rx7hnh9l")))) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f ;no tests were found + #:configure-flags + #~(list "-DENABLE_FFMPEG=ON" + "-DENABLE_GLES=ON" + "-DENABLE_LIBAVIF=ON" + "-DENABLE_QT6=ON" + "-DENABLE_TOOLS=ON" + "-DUSE_QT6=ON") + #:phases + #~(modify-phases %standard-phases + ;; TODO: Wrap celestia-content instead of copping it, if posible. + (add-after 'install 'install-content + (lambda _ + (copy-recursively + (string-append #$(this-package-native-input "celestia-content") + "/share") + (string-append #$output "/share"))))))) + (native-inputs + (list boost + celestia-content + gettext-minimal + pkg-config)) + (inputs + (list eigen + ffmpeg + fmt + freetype + glu + gperf + libavif + libepoxy + libjpeg-turbo + libpng + mesa + qtbase + qtwayland)) + (propagated-inputs + (list lua + perl)) + (home-page "https://celestia.space/") + (synopsis "Real-time 3D visualization of space") + (description + "This simulation program lets you explore our universe in three dimensions. Celestia simulates many different types of celestial objects. From planets and moons to star clusters and galaxies, you can visit every object in the expandable database and view it from any point in space and time. The position and movement of solar system objects is calculated accurately in real time at any rate desired.") - (license license:gpl2+))) + (license license:gpl2+)))) + +(define-public celestia-content + ;; No rleases or version tags. + (let ((commit "10bd43b0e8925f6ee9bb9687522708a95338d664") + (revision "0")) + (package + (name "celestia-content") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/CelestiaProject/CelestiaContent") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gah823hdf0lhyql6ln6cmivfl9d8dr7yp3mrc1rcw7bm4hbb2qq")))) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f)) ;no tests were found + (native-inputs + (list gettext-minimal + imagemagick)) + (home-page "https://celestia.space/") + (synopsis "Data files for Celestia space simulator") + (description + "This package provides data content for Celestia. +@itemize +@item Scientific Data Base +@item Texture maps +@item 3D Models +@end itemize") + (license license:gpl2+)))) (define-public celestia-gtk (deprecated-package "celestia-gtk" celestia)) @@ -873,6 +919,59 @@ applications of EyE include adaptive filtering, feature detection and cosmetic corrections.") (license license:cecill))) +(define-public fitsverify + (package + (name "fitsverify") + (version "4.22") + (source + (origin + (method url-fetch) + (uri (string-append "https://heasarc.gsfc.nasa.gov/docs/software/ftools/" + name "/" name "-" version ".tar.gz")) + (sha256 + (base32 "1d0qvgmrpv09qm4vi4n26frx4qb3mrdn261rs6vvrvg0lw1yhibc")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ;no tests + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ; no configure + (replace 'build + (lambda* _ + ;; Build steps are taken from Debian's package definition. + (invoke #$(cc-for-target) "-o" #$name + "ftverify.c" + "fvrf_data.c" + "fvrf_file.c" + "fvrf_head.c" + "fvrf_key.c" + "fvrf_misc.c" + "-DSTANDALONE" + "-lcfitsio" + "-lm"))) + (replace 'install + (lambda _ + (install-file #$name (string-append #$output "/bin"))))))) + (inputs + (list cfitsio)) + (home-page "https://heasarc.gsfc.nasa.gov/docs/software/ftools/fitsverify/index.html") + (synopsis "FITS File Format-Verification Tool") + (description + "Fitsverify is a computer program that rigorously checks whether a +@acronym{FITS, Flexible Image Transport System} data file conforms to the +requirements defined in Version 3.0 of the +@url{http://fits.gsfc.nasa.gov/fits_documentation.html, FITS Standard +document}.") + (properties + '((release-monitoring-url . + "https://heasarc.gsfc.nasa.gov/docs/software/ftools/fitsverify/"))) + ;; The license is the same as for CFITSIO, see + ;; URL: + ;; File: + (license (license:non-copyleft "file://License.txt" + "See License.txt in the distribution.")))) + (define-public ginga (package (name "ginga") @@ -1244,7 +1343,7 @@ floating-point (no compression, LZW- or ZIP-compressed), FITS 8-bit, 16-bit, (define-public indi (package (name "indi") - (version "2.1.5") + (version "2.1.5.1") (source (origin (method git-fetch) @@ -1253,7 +1352,7 @@ floating-point (no compression, LZW- or ZIP-compressed), FITS 8-bit, 16-bit, (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "03qr5kvjr9dy8pwppn74mblkjxvm1nksbw2d9xinva8x4lxv8pry")))) + (base32 "1wak0wnd05grc357wa4snyx3f7nc8ymbpfndialhywfi6a43gdlr")))) (build-system cmake-build-system) (arguments (list @@ -1643,6 +1742,25 @@ PixInsight}. It implements 1.0 specification}.") (license license:gpl3+))) +(define-public libxisf-for-tenmon + ;; This is an exact commit required for tenmon git submodule. + (let ((commit "556bb22d2675ee6072c6224fef3da0fb5d93db41") + (revision "0")) + (hidden-package + (package + (inherit libxisf) + (name "libxisf") + (version (git-version "0.2.13" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitea.nouspiro.space/nou/libXISF") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "037dijy0ql1mwm8nddwawlf3ms6w30kxdlkrjjprfsss80ssn30k")))))))) + (define-public missfits (package (name "missfits") @@ -1683,8 +1801,8 @@ R. Seaman's protocol} (define-public phd2 ;; The tag 2.6.13 was placed in 2023, but there are a lot of changes, fixes ;; and compatability with indi@2, use the latest commit from master branch. - (let ((commit "cc00236e79810da48e691e6a4785eb7e10b794ac") - (revision "0")) + (let ((commit "4353f6b2a1438caea44a9c2fb4d639a96478e697") + (revision "1")) (package (name "phd2") (version (git-version "2.6.13" revision commit)) @@ -1696,7 +1814,7 @@ R. Seaman's protocol} (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1b6fzniy5w9bx4627761nd4laargy728zvhw4k69dinwdwdi8jjw")) + (base32 "1bb8bmclgkpcqdx5jqag1raa4jviczkwyckbhph3xlg7zjbckik2")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-26))) @@ -1851,13 +1969,13 @@ model-fitting photometry or morphological analyses.") (define-public python-aiapy (package (name "python-aiapy") - (version "0.10.1") + (version "0.10.2") (source (origin (method url-fetch) (uri (pypi-uri "aiapy" version)) (sha256 - (base32 "009zj20jcqlw2i8llx0pnxyz8416h4ng9avpqjrqszlhcq9xavrn")))) + (base32 "0lr8v2bakqxqn516fr45905lcql72kac3q6rdzn24rn95f812n27")))) (build-system pyproject-build-system) (arguments (list @@ -1958,13 +2076,13 @@ Main features: (define-public python-asdf (package (name "python-asdf") - (version "4.4.0") + (version "5.0.0") (source (origin (method url-fetch) (uri (pypi-uri "asdf" version)) (sha256 - (base32 "0gincjs1vn6wxryazbkgmxy45cn1azb2yphj7nwg05yjwccn257p")))) + (base32 "1405fmv0f8dxr949njfw368bkm7w8cnqr5w6nqlxr68vvc1pghx7")))) (build-system pyproject-build-system) (arguments (list @@ -1973,24 +2091,23 @@ Main features: (native-inputs (list python-psutil python-pytest - python-pytest-doctestplus python-pytest-remotedata python-pytest-xdist python-setuptools - python-setuptools-scm - python-wheel)) + python-setuptools-scm)) (propagated-inputs (list python-asdf-standard python-asdf-transform-schemas python-attrs ;; for vendorized jsonschema - python-fsspec python-importlib-metadata python-jmespath - python-lz4 python-numpy python-packaging python-pyyaml - python-semantic-version)) + python-semantic-version + ;; [optional] + python-fsspec + python-lz4)) (home-page "https://github.com/asdf-format/asdf") (synopsis "Python tools to handle ASDF files") (description @@ -2010,6 +2127,17 @@ implementation of the ASDF Standard.") (sha256 (base32 "0scnw5y4x5k3vyfylq0w612b662xlccx3gsscaw082zlv2yxfyh4")))))) +(define-public python-asdf-4 + (package + (inherit python-asdf) + (version "4.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "asdf" version)) + (sha256 + (base32 "1h9dvnxdcd7cmjddpfnjsn6a1acav8gm5307gf7kpifacf99fdqz")))))) + (define-public python-asdf-astropy (package (name "python-asdf-astropy") @@ -2044,12 +2172,12 @@ implementation of the ASDF Standard.") (lambda _ (setenv "HOME" "/tmp")))))) (native-inputs (list python-pytest + python-pytest-asdf-plugin python-pytest-astropy python-pytest-xdist python-scipy python-setuptools - python-setuptools-scm - python-wheel)) + python-setuptools-scm)) (propagated-inputs (list python-asdf python-asdf-coordinates-schemas @@ -2074,7 +2202,7 @@ Astropy objects.") (delete 'sanity-check)))) (native-inputs (list python-setuptools - python-wheel)) + python-setuptools-scm)) (propagated-inputs (list python-importlib-metadata python-numpy @@ -2145,7 +2273,7 @@ support for reading and writing various compression algorithms including: (native-inputs (list python-pytest python-pytest-xdist - python-setuptools-next + python-setuptools python-setuptools-scm python-wheel)) (propagated-inputs @@ -2161,26 +2289,23 @@ implementation package such as asdf-astropy.") (define-public python-asdf-standard (package (name "python-asdf-standard") - (version "1.3.0") + (version "1.4.0") (source (origin (method url-fetch) (uri (pypi-uri "asdf_standard" version)) (sha256 - (base32 - "0r7dxbiwngpwwjdbs2vqk94v1vjsgyilswkq180d5slx74grcn2r")))) + (base32 "1p7x5j8ym70c2cmgnv0113i4q465jbrqg8311mwbfz5q1lfi4pqc")))) (build-system pyproject-build-system) (native-inputs (list python-asdf-bootstrap python-asdf-transform-schemas-bootstrap - python-astropy-minimal - python-jsonschema - python-pypa-build - python-pytest python-packaging - python-setuptools-next - python-setuptools-scm - python-wheel)) + python-pytest + python-pytest-asdf-plugin + python-pyyaml + python-setuptools + python-setuptools-scm)) (home-page "https://asdf-standard.readthedocs.io/") (synopsis "ASDF standard schemas") (description @@ -2399,13 +2524,13 @@ astronomical images, especially when there is no WCS information available.") (define-public python-astrocut (package (name "python-astrocut") - (version "1.0.1") + (version "1.1.0") (source (origin (method url-fetch) (uri (pypi-uri "astrocut" version)) (sha256 - (base32 "14m713y90zj3v5hhlmq79cslqlr8dz8y3zyk454qda01fkcj6za7")))) + (base32 "1i8cpghk31cds9ipgap2ffws7jqy0smgk6w6kihxwpcw34jkr8h4")))) (build-system pyproject-build-system) (arguments (list @@ -2430,7 +2555,12 @@ astronomical images, especially when there is no WCS information available.") "test_tess_footprint_cutout_write_as_tpf" ;; Some NumPy compatability errors during tests. "test_get_cutout_limits" - "test_get_cutout_wcs") + "test_get_cutout_wcs" + ;; botocore.exceptions.EndpointConnectionError: + ;; Could not connect to the endpoint URL: + ;; "https://stpubdata.s3.amazonaws.com/tess/public/\ + ;; footprints/tess_ffi_footprint_cache.json" + "test_tess_footprint_cutout") " and not ")) #:phases #~(modify-phases %standard-phases @@ -2819,11 +2949,6 @@ astronomy and astrophysics.") (list #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'relax-requirements - (lambda _ - (substitute* "setup.cfg" - ;; numpy>=1.25 - ((">=1.25") ">=1.24")))) (replace 'check (lambda* (#:key tests? test-flags #:allow-other-keys) (when tests? @@ -2846,13 +2971,13 @@ astronomy and astrophysics.") (define-public python-astropy-iers-data (package (name "python-astropy-iers-data") - (version "0.2025.8.18.0.40.14") + (version "0.2025.9.15.0.37.0") (source (origin (method url-fetch) (uri (pypi-uri "astropy_iers_data" version)) (sha256 - (base32 "1srqhva7snjaygfji4947q4lxhdqph1l97lxjvk4s8ls5w32yrhc")))) + (base32 "1n4i60fni2l6bph2kj2smy9rzcjhl3s79ihw9v1sgdf1zpf17r9k")))) (build-system pyproject-build-system) (arguments (list #:tests? #f)) ; no tests @@ -3119,13 +3244,13 @@ Origins Spectrograph}.") (define-public python-camb (package (name "python-camb") - (version "1.6.2") + (version "1.6.4") (source (origin (method url-fetch) (uri (pypi-uri "camb" version)) (sha256 - (base32 "1h9zdfsk14vx8hwpsvgs351cid1waggd47hj0yhy69djz935rgq5")))) + (base32 "1l9c8s263i3zgs50sn000yw0vyhrk56rvfcv18pwxs1zbq8bw0si")))) (build-system pyproject-build-system) (arguments (list @@ -3141,7 +3266,6 @@ Origins Spectrograph}.") (list gfortran python-packaging python-setuptools - python-wheel which)) ; for fortran/Makefile (propagated-inputs (list python-numpy @@ -3575,6 +3699,42 @@ JSON template file alongside Python routines for visualizing and comparing lens models possibly obtained from different modeling codes.") (license license:gpl3))) +(define-public python-corsikaio + (package + (name "python-corsikaio") + (version "0.5.0") + (source + (origin + (method git-fetch) ; no tests in the PyPI tarball + (uri (git-reference + (url "https://github.com/cta-observatory/pycorsikaio") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1afv7jra31fi2g85z8jzmjr6w1wk9xs4v2cg06df2zffqfgfjnjj")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'set-env-version + (lambda _ + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version)))))) + (native-inputs + (list python-pytest + python-scipy + python-setuptools-next + python-setuptools-scm)) + (propagated-inputs + (list python-numpy)) + (home-page "https://github.com/cta-observatory/pycorsikaio") + (synopsis "Reader for CORSIKA binary output files") + (description + "This package implements a reader for +@url{https://www.iap.kit.edu/corsika/, @acronym{CORSIKA, COsmic Ray +SImulations for KAscade}} binary output files using NumPy.") + (license license:expat))) + (define-public python-cosmopy (package (name "python-cosmopy") @@ -3635,13 +3795,13 @@ Spectrograph}.") (define-public python-crds (package (name "python-crds") - (version "12.1.11") + (version "13.0.4") (source (origin (method url-fetch) (uri (pypi-uri "crds" version)) (sha256 - (base32 "1h4n5wyv23pa1fld2nfqph6app8zxb8zkzv5p1w6dm11n7zbnxih")))) + (base32 "02901rqzvgd8ssw1rv3skinqbxp0nycwx75k7n3bn3fjyfn2g2zc")))) (build-system pyproject-build-system) (arguments (list @@ -3681,19 +3841,18 @@ Spectrograph}.") python-pytest-astropy python-pytest-doctestplus python-setuptools - python-setuptools-scm - python-stsynphot - python-wheel)) + python-setuptools-scm)) (propagated-inputs - (list python-asdf - python-astropy - python-beautifulsoup4 - python-boto3 - python-filelock + (list python-astropy python-numpy - python-parsley - python-pysynphot + python-filelock + python-asdf python-requests + python-parsley + ;; [optional] + python-beautifulsoup4 + ;; python-crds -> python-ci-watson -> python-jwst -> python-crds + ;; python-jwst python-roman-datamodels python-stsynphot)) (home-page "https://hst-crds.stsci.edu") @@ -3779,6 +3938,7 @@ Cesium.") (list python-pydot python-pytest python-pytest-cov + python-pytest-asdf-plugin python-pytest-doctestplus python-pytest-filter-subpackage python-pytest-httpserver @@ -4096,6 +4256,51 @@ numerical python, statistics, and file input/output. Includes specialized tools for astronomers.") (license license:gpl2+))) +(define-public python-eventio + (package + (name "python-eventio") + (version "1.16.1") + (source + (origin + (method git-fetch) ; no test data in the PyPI tarball + (uri (git-reference + (url "https://github.com/cta-observatory/pyeventio") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jg2zgs0z5jfkdkbgxiiclxkyxrz4zhb57x1ji0c5pd2vsrn4g92")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-env-version + (lambda _ + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version))) + (add-before 'build 'relax-gcc-14-strictness + (lambda _ + (setenv "CFLAGS" (string-join + (list "-g" "-O2" + "-Wno-error=implicit-function-declaration" + "-Wno-error=int-conversion") + " "))))))) + (native-inputs + (list python-cython + python-numpy + python-pytest + python-setuptools-next + python-setuptools-scm-next)) + (propagated-inputs + (list python-corsikaio + python-matplotlib + python-numpy + python-zstandard)) + (home-page "https://github.com/cta-observatory/pyeventio") + (synopsis "Python read-only implementation of the EventIO file format") + (description + "Python read-only implementation of the @code{EventIO} file format.") + (license license:expat))) + (define-public python-extinction (package (name "python-extinction") @@ -4160,13 +4365,13 @@ all the input image headers.") (define-public python-fitsio (package (name "python-fitsio") - (version "1.2.6") + (version "1.2.8") (source (origin (method url-fetch) (uri (pypi-uri "fitsio" version)) (sha256 - (base32 "1brkkfqgfwbnl1si7hppripcixmsfjs5lpbn18yrwxziafycvc1k")) + (base32 "1cbynx6lyf38863njqyg1gnpcdp69bxywmi0ckhzgf9wicxf31nk")) (modules '((guix build utils))) (snippet ;; Remove the bundled cfitsio. When update the package check the @@ -4193,8 +4398,7 @@ all the input image headers.") #$(this-package-input "cfitsio") "/lib"))))))) (native-inputs (list python-pytest - python-setuptools - python-wheel)) + python-setuptools-next)) (inputs (list curl cfitsio @@ -4412,7 +4616,10 @@ across many files.") (build-system pyproject-build-system) (arguments (list - #:test-flags #~(list "--pyargs" "glue_vispy_viewers") + #:test-flags + #~(list "--pyargs" "glue_vispy_viewers" + ;; XXX: Fatal Python error: Segmentation fault. + "-k" "not test_vispy_widget") #:phases #~(modify-phases %standard-phases (add-before 'check 'prepare-x @@ -4805,23 +5012,32 @@ observationally-derived galaxy merger catalogs.") (define-public python-irispy-lmsal (package (name "python-irispy-lmsal") - (version "0.3.1") + (version "0.4.0") (source (origin (method url-fetch) (uri (pypi-uri "irispy_lmsal" version)) (sha256 - (base32 "037ip97kb5sq98shgw4d1c5x7lpbzksampfw7d97x59zbvbmvwhn")))) + (base32 "1al7nyw2d2175gbij7ab2q0ks3wsf4b7n6g89ic2mpg4v1ybyxw5")))) (build-system pyproject-build-system) (arguments (list + ;; tests: 68 passed, 1 skipped, 9 deselected, 2 warnings #:test-flags ;; See: . ;; Expected: ;; np.float64(0.33) ;; Got: ;; 0.33 - #~(list "--deselect=irispy/obsid.py::irispy.obsid.ObsID") + #~(list "--deselect=irispy/obsid.py::irispy.obsid.ObsID" + ;; TODO: Report upstram. + ;; Arrays are not almost equal to 4 decimals + ;; Mismatched elements: 42 / 3601 (1.17%) + ;; Max absolute difference: 0.34272391 + ;; Max relative difference: 0.00491848 + ;; x: array([0., 0., 0., ..., 0., 0., 0.]) + ;; y: array([0., 0., 0., ..., 0., 0., 0.], dtype='>f4') + "-k" "not test_get_latest_response_to_idl") #:phases #~(modify-phases %standard-phases ;; XXX: It fails to check SunPy's optional inputs versions. @@ -4877,7 +5093,7 @@ satellite.") (with-directory-excursion "ci" (invoke "python" "-m" "unittest" "test")))))))) (native-inputs - (list python-setuptools-next)) + (list python-setuptools)) (propagated-inputs (list python-numpy)) (home-page "https://github.com/brandon-rhodes/python-jplephem") @@ -4920,13 +5136,13 @@ milliarcsecond).") (define-public python-jwst (package (name "python-jwst") - (version "1.19.1") + (version "1.19.2") (source (origin (method url-fetch) (uri (pypi-uri "jwst" version)) (sha256 - (base32 "1bds1a8bgyac19bwr7kf6wcknkmmchji23svhr8mpciga8gm27gv")) + (base32 "08c6wm7nchdq3cha9267h0i49s81yq0rz5y6nsbmganx0i9sg2aq")) (modules '((guix build utils))) (snippet #~(begin @@ -4951,6 +5167,8 @@ milliarcsecond).") (add-before 'build 'relax-requirements (lambda _ (substitute* "pyproject.toml" + ;; asdf>=4.0,<5 + ((">=4.0,<5") ">=4.0") ;; drizzle>=2.0.1,<2.1.0 ((">=2.0.1,<2.1.0") ">=2.0.1") ;; stcal>=1.14.1,<1.15.0 @@ -4978,7 +5196,7 @@ milliarcsecond).") (propagated-inputs ;; opencv provides OpenCV-Python which is Listed as install requirement. (list opencv - python-asdf + python-asdf-4 python-asdf-astropy python-astropy python-bayesicfitting @@ -5681,16 +5899,17 @@ photometry, segmentations, Petrosian profiling, and Sérsic fitting.") (define-public python-photutils (package (name "python-photutils") - (version "2.2.0") + (version "2.3.0") (source (origin (method url-fetch) (uri (pypi-uri "photutils" version)) (sha256 - (base32 "1h1bf8694pf9qdv9gf0934v6dk08d3ybrj858salqnfz6prnfnzb")))) + (base32 "1xyrnf0ynh8l3dad8s93dyqk3m9gvmxgvrji1nb9yillfzvjfxcl")))) (build-system pyproject-build-system) (arguments (list + ;; tests: 1843 passed, 22 skipped #:test-flags #~(list "--pyargs" "photutils" "--numprocesses" (number->string (min 8 (parallel-job-count)))) @@ -5701,6 +5920,13 @@ photometry, segmentations, Petrosian profiling, and Sérsic fitting.") (when tests? (with-directory-excursion "/tmp" (apply invoke "pytest" "-vv" test-flags)))))))) + (native-inputs + (list python-cython-3 + python-extension-helpers + python-pytest-astropy + python-pytest-xdist + python-setuptools-next + python-setuptools-scm-next)) (propagated-inputs (list python-astropy python-bottleneck @@ -5713,17 +5939,11 @@ photometry, segmentations, Petrosian profiling, and Sérsic fitting.") python-scipy python-shapely python-tqdm)) - (native-inputs - (list python-cython-3 - python-extension-helpers - python-pytest-astropy - python-pytest-xdist - python-setuptools - python-setuptools-scm)) (home-page "https://github.com/astropy/photutils") (synopsis "Source detection and photometry") - (description "Photutils is an Astropy package for detection and photometry -of astronomical sources.") + (description + "Photutils is an Astropy package for detection and photometry of +astronomical sources.") (license license:bsd-3))) (define-public python-pint-pulsar @@ -5854,14 +6074,26 @@ and the use of a modern programming language, techniques, and libraries (define-public python-pixell (package (name "python-pixell") - (version "0.29.0") + (version "0.30.0") (source (origin (method url-fetch) (uri (pypi-uri "pixell" version)) (sha256 - (base32 "17ivl01j2a6j6frzxdmzb4bdbs94n8rkipz2lh3zhhkx17djlbfh")))) + (base32 "0ncqqwvpg47yihlplzmhn8za8y7wab5k71n87nz8bcvzj8gnmpvw")))) (build-system pyproject-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'relax-requirements + ;; XXX: To prevent sanity check faileur in dependent + ;; packages, Cython, Coveralls and Pytests are not required + ;; during runtime. + (lambda _ + (substitute* "pyproject.toml" + ((" 'cython',") "") + ((" 'coveralls>=1.5',") "") + ((" 'pytest>=4.6',") ""))))))) (native-inputs (list gfortran meson-python @@ -5871,8 +6103,6 @@ and the use of a modern programming language, techniques, and libraries python-pytest)) (propagated-inputs (list python-astropy - python-coveralls - python-cython ; check why it needs in installation python-dateutil python-ducc0 python-h5py @@ -6126,6 +6356,35 @@ Pipeline Library, CPL} toolkit, including the CPL plugin interface.") (properties '((upstream-name . "pycpl"))) (license license:bsd-3))) +(define-public python-pydl + (package + (name "python-pydl") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pydl" version)) + (sha256 + (base32 "0z08c05qf0ix4h348n0hhxixn1wipdm55g9z6qys24z41ywf69jh")))) + (build-system pyproject-build-system) + (native-inputs + (list python-pytest-astropy + python-pytest-mock + python-setuptools-next + python-setuptools-scm)) + (propagated-inputs + (list python-astropy + python-scipy)) + (home-page "https://github.com/weaverba137/pydl") + (synopsis "IDL astronomy routines converted to Python") + (description + "This package consists of Python replacements for functions that are part +of the @url{https://www.nv5geospatialsoftware.com/Products/IDL, IDL} built-in +library or part of astronomical IDL libraries. The emphasis is on reproducing +results of the astronomical library functions. Only the bare minimum of IDL +built-in functions are implemented to support this.") + (license license:bsd-3))) + (define-public python-pyerfa (package (name "python-pyerfa") @@ -6536,16 +6795,16 @@ natively in Siril.") (define-public python-pysm3 (package (name "python-pysm3") - (version "3.4.1a1") + (version "3.4.2") (source (origin (method git-fetch) ; no tests data in the PyPI tarball (uri (git-reference - (url "https://github.com/galsci/pysm") - (commit version))) + (url "https://github.com/galsci/pysm") + (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0rp22d1ckln9j490ga5snk0xb28qal1i10m4kqmhg7sfkw7dnnzs")))) + (base32 "0r8njxss389hqz1nxixamhclays6blyrq7qnrzs2776w9c0cv6vb")))) (build-system pyproject-build-system) (arguments (list @@ -6554,36 +6813,44 @@ natively in Siril.") ;; ;; #~(list "-k" (string-join - (list "not test_model" + (list "not test_bandpass_unit_conversion" "test_bandpass_unit_conversion_CMB2MJysr" "test_bandpass_unit_conversion_MJysr2KRJ" "test_cmb_lensed" + "test_cmb_lensed_delens" + "test_cmb_lensed_l01" + "test_cmb_lensed_no_delens" + "test_cmb_lensed_with_patch_object" "test_cmb_map" "test_cmb_map_bandpass" "test_co" "test_co_model" - "test_dust_model" - "test_model_d12" "test_d10_vs_d11" + "test_dust_model" "test_dust_model_353" "test_gnilc_857" + "test_healpix_output_nside" "test_highfreq_dust_model" + "test_model" + "test_model_d12" "test_presmoothed" - "test_sky_max_nside" - "test_sky_max_nside_highres" "test_read_map_unit" "test_read_map_unit_dimensionless" - "test_healpix_output_nside" + "test_s6_vs_s5" + "test_sky_max_nside" + "test_sky_max_nside_highres" "test_smoothing_healpix" "test_smoothing_healpix_beamwindow" - "test_s6_vs_s5" "test_synch_44" "test_synch_model_noscaling" "test_synch_model_s7_44" "test_synch_model_s7_noscaling" "test_synchrotron_model" - "test_bandpass_unit_conversion") - " and not ")) + ;; RuntimeError: This function has been removed. Use + ;; reproject.healpix2map(...method='harm'). + "test_car_nosmoothing") + " and not ") + "tests") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'set-version @@ -6593,6 +6860,7 @@ natively in Siril.") (list nss-certs-for-test python-hatch-vcs python-hatchling + python-nbval python-netcdf4 python-pixell python-psutil @@ -6602,8 +6870,11 @@ natively in Siril.") python-xarray)) (propagated-inputs (list python-astropy + python-h5py python-healpy python-numba + python-numpy + python-scipy python-toml)) (home-page "https://pysm3.readthedocs.io/") (synopsis "Sky emission simulations for Cosmic Microwave Background experiments") @@ -6712,6 +6983,49 @@ export the simulated X-ray events to other software packages to simulate the end products of specific X-ray observatories.") (license license:bsd-3))) +(define-public python-raccoon + (package + (name "python-raccoon") + (version "1.0.0") + (source + (origin + ;; PyPi tarball lacks tests. + (method git-fetch) + (uri (git-reference + (url "https://github.com/ajshajib/raccoon") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hn8g7zxga47yhk4y9nrbnz0n7apflczlaszr79h4lg6b4v4h9f4")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + #~(list "-k" (string-join + ;; Three tests fail with error: AttributeError: module + ;; 'numpy' has no attribute 'trapezoid'. + (list "not test_clean_cube" + "test_clean_cube_with_min_n_amplitude_and_min_n_f" + "test_clean_cube_with_wiggle_detection_thresholds") + " and not ")))) + (native-inputs + (list python-pytest + python-setuptools-next)) + (propagated-inputs + (list python-astropy + python-matplotlib + python-numpy + python-scipy + python-statsmodels + python-tqdm)) + (home-page "https://github.com/ajshajib/raccoon") + (synopsis "Clean modulation due to resampling noise in the JWST/NIRSpec IFS spectra") + (description + "Package Raccoon cleans the \"wiggles\" (i.e., low-frequency sinusoidal +artifacts) in the JWST-NIRSpec IFS (integral field spectroscopy) data. These +wiggles are caused by resampling noise or aliasing artifacts.") + (license license:bsd-3))) + (define-public python-rad (package (name "python-rad") @@ -6725,7 +7039,7 @@ end products of specific X-ray observatories.") (build-system pyproject-build-system) (arguments (list - ;; 1131 passed, 1 skipped + ;; tests: 1253 passed, 1 skipped #:test-flags ;; Ignore tests requiring python-crds to break cycle: ;; python-rad -> python-roman-datamodels -> python-crds -> python-rad @@ -6737,9 +7051,10 @@ end products of specific X-ray observatories.") "--ignore=tests/test_latest.py"))) (native-inputs (list python-pytest + python-pytest-asdf-plugin python-pytest-doctestplus python-semantic-version - python-setuptools-next + python-setuptools python-setuptools-scm)) (propagated-inputs (list python-asdf @@ -7498,13 +7813,13 @@ but has evolved to support other missions as well.") (define-public python-space-dolphin (package (name "python-space-dolphin") - (version "1.1.3") + (version "1.2.0") (source (origin (method url-fetch) (uri (pypi-uri "space_dolphin" version)) (sha256 - (base32 "0qsdaqbdf51ai54w4d483bf9kxjjcsr5fiqs861z7k7s7zrjms0r")))) + (base32 "162899av6mp0wkjbas07xkqjr70qbvirgnnch7hb501gz0rb50bh")))) (build-system pyproject-build-system) (arguments (list @@ -7518,8 +7833,7 @@ but has evolved to support other missions as well.") (setenv "NUMBA_CACHE_DIR" "/tmp")))))) (native-inputs (list ;; python-pytest - python-setuptools - python-wheel)) + python-setuptools)) (propagated-inputs (list python-astropy python-corner @@ -7802,6 +8116,7 @@ of axis order, spatial projections, and spectral units that exist in the wild. (setenv "HOME" "/tmp")))))) (native-inputs (list python-matplotlib + python-pytest-asdf-plugin python-pytest-astropy python-setuptools python-setuptools-scm @@ -8089,6 +8404,7 @@ and CAS statistics), as well as fitting 2D Sérsic profiles.") python-crds python-psutil python-pytest + python-pytest-asdf-plugin python-pytest-doctestplus python-pytest-xdist python-scipy @@ -8096,7 +8412,7 @@ and CAS statistics), as well as fitting 2D Sérsic profiles.") python-setuptools-scm python-wheel)) (propagated-inputs - (list python-asdf + (list python-asdf-4 python-asdf-astropy python-astropy python-numpy)) @@ -8988,13 +9304,13 @@ to the SolarSoft data analysis environment.") (define-public python-sunraster (package (name "python-sunraster") - (version "0.6.1") + (version "0.6.2") (source (origin (method url-fetch) (uri (pypi-uri "sunraster" version)) (sha256 - (base32 "0a1w7958n4m1qm59x6y00a0p45b5drnj1ippwl7gvszbwamhr2gr")))) + (base32 "0rpxarw108igdgxvdz1g63yhyam6mgkpp7l1kkcxqyqv9najnrh4")))) (build-system pyproject-build-system) (arguments (list @@ -9583,7 +9899,7 @@ It can be used to calculate the trajectory of satellites.") (define-public siril (package (name "siril") - (version "1.4.0-beta3") + (version "1.4.0-beta4") (source (origin (method git-fetch) @@ -9591,12 +9907,31 @@ It can be used to calculate the trajectory of satellites.") (url "https://gitlab.com/free-astro/siril") (commit version))) (sha256 - (base32 "1frvi6879zh4bzm5smdy0scpjmj5pg2i81wb2wa4ikq1dq227x8k")) - (file-name (git-file-name name version)))) + (base32 "104wb5m2bb51mi3yqndp0s69281i6px5dxcwlldhjp85cwp3qv51")) + (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet + #~(begin + ;; Remove bundled libraries. + (for-each delete-file-recursively + (list "subprojects/healpix_cxx" + ;; TODO: Package htmesh, it's included in KSarts + ;; - URL: + ;; - File: + ;; "subprojects/htmesh" + ;; + ;; TODO: Package kplot - Cairo plotting library + ;; . + ;; "subprojects/kplot" + "subprojects/wcslib" + "subprojects/librtprocess" + "subprojects/yyjson")))))) (build-system meson-build-system) (arguments (list #:glib-or-gtk? #t + #:configure-flags + #~(list "--wrap-mode=nodownload") #:imported-modules `(,@%meson-build-system-modules (guix build glib-or-gtk-build-system)) #:modules '((guix build meson-build-system) @@ -9630,9 +9965,10 @@ It can be used to calculate the trajectory of satellites.") ffms2 fftwf gdk-pixbuf - gtksourceview-4 gsl gtk+ + gtksourceview-4 + healpix-cxx json-glib lcms-next @@ -9770,7 +10106,7 @@ astronomical fields. SkyMaker is part of the (define-public splash (package (name "splash") - (version "3.11.4") + (version "3.11.5") (source (origin (method git-fetch) @@ -9779,7 +10115,7 @@ astronomical fields. SkyMaker is part of the (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "13p4hjdpr0yacgh8v3lf5vy1d0hdh5axbwpgi91wafm0xx6zpgkv")))) + (base32 "1sdfgn2rh1gq3n1ya55qhv9j8bf700f2lhp2k9avy1aix903ry36")))) (build-system gnu-build-system) (arguments ;; FIXME: Tests failed @@ -10191,6 +10527,80 @@ See related paper @url{https://ui.adsabs.harvard.edu/abs/2006MNRAS.369..655H/abstract}.") (license license:gpl3+))) +(define-public tenmon + (package + (name "tenmon") + (version "20250915") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitea.nouspiro.space/nou/tenmon") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ay95kdsmv4xli25l7khga4ldwy4irrfc15649s3mgqcd5gl3pfw")))) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f ;no test target + #:configure-flags + #~(list "-DCMAKE_C_FLAGS=-Wno-error=implicit-function-declaration") + #:phases + #~(modify-phases %standard-phases + ;; libxisf is expected to be found as git submodule, link it before + ;; build. + (add-after 'unpack 'link-libxisf + (lambda _ + (rmdir "libXISF") + (symlink #+(package-source (this-package-native-input "libxisf")) + (string-append (getcwd) "/libXISF"))))))) + (native-inputs + (list git-minimal/pinned + libxisf-for-tenmon + pkg-config )) + (inputs + (list cfitsio + glu + gsl + libexif + libraw + qtbase + qtcharts + qtdeclarative + wcslib + zstd + (list zstd "lib"))) + (home-page "https://nouspiro.space/?page_id=206") + (synopsis "FITS and XISF image viewer, converter and indexer") + (description + "FITS/XISF image viewer with multithreaded image loading. It is intended +primarily for viewing astro photos and images with support of following +formats: + +@itemize +@item FITS 8, 16 bit integer and 32 bit float +@item XISF 8, 16 bit integer and 32 bit float +@item RAW CR2, DNG, NEF +@item JPEG, PNG, BMP, GIF, PBM, PGM, PPM and SVG images +@end itemize + +Features: +@itemize +@item using same stretch function as PixInsight +@item OpenGL accelerated drawing +@item index and search FITS XISF header data +@item quick mark images and then copy/move marked files +@item convert FITS <-> XISF +@item convert FITS/XISF -> JPEG/PNG +@item image statistics mean, media, min, max +@item support for WCS +@item thumbnails +@item convert CFA images to colour - debayer +@item color space aware +@end itemize") + (license license:gpl3+))) + (define-public unsio ;; There is no versioned tag, use the latest commit. (let ((commit "ac48210ec24432ec3ad330c4203e7eb21876a921") @@ -10229,7 +10639,7 @@ n-body file formats (nemo, Gadget binaries 1 and 2, Gadget hdf5, Ramses).") (define-public uraniborg (package (name "uraniborg") - (version "0.0.10") + (version "0.0.12") (source (origin (method git-fetch) @@ -10238,7 +10648,7 @@ n-body file formats (nemo, Gadget binaries 1 and 2, Gadget hdf5, Ramses).") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0bz2k2x06nyvhr9v4z6f21cf29pqsj9m4qyn8sdbl421wsqj31wg")))) + (base32 "1n24c7ihz49piry36sfvig9qag948k4wkn9a7b5v7c1yax5ab4ap")))) (build-system go-build-system) (arguments (list diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 4b974917893..c597210d530 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2694,7 +2694,8 @@ based on the Haskell library, Quickcheck, and is designed to integrate seamlessly into your existing Python unit testing work flow.") (license license:mpl2.0))) -(define-public python-hypothesis-next python-hypothesis) +(define-deprecated/public-alias python-hypothesis-next + python-hypothesis) ;may be removed after 2025-12-01 ;; WARNING: This package is a dependency of mesa. (define-public python-lit diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index ab6f6209ac2..f7ba461facc 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -139,6 +139,66 @@ a system that allows you to easily communicate between processes, and separate your project into different processes.") (license license:bsd-3))) +(define-public python-crispy-bootstrap3 + (package + (name "python-crispy-bootstrap3") + (version "2024.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/django-crispy-forms/crispy-bootstrap3") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ncf8hz3yf8h0asvyi1g54ds0glp46zfcr6sklhsynbqzmcqd463")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + (setenv "PYTHONPATH" ".")))))) + (propagated-inputs (list python-django python-django-crispy-forms)) + (native-inputs (list python-pytest python-pytest-django python-setuptools)) + (home-page "https://github.com/django-crispy-forms/crispy-bootstrap3") + (synopsis "Bootstrap3 template pack for django-crispy-forms") + (description + "This package provides a bootstrap3 template pack for +@code{python-django-crispy-forms}.") + (license license:expat))) + +(define-public python-crispy-bootstrap4 + (package + (name "python-crispy-bootstrap4") + (version "2025.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/django-crispy-forms/crispy-bootstrap4") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0kyyyrg39ckqw3pmsq67g5xzgmcd7xjgz7vpsr97gaai1frnsvnr")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + (setenv "PYTHONPATH" ".")))))) + (propagated-inputs (list python-django python-django-crispy-forms)) + (native-inputs (list python-pytest python-pytest-django python-setuptools)) + (home-page "https://github.com/django-crispy-forms/crispy-bootstrap4") + (synopsis "Bootstrap4 template pack for django-crispy-forms") + (description + "This package provides a bootstrap4 template pack for +@code{python-django-crispy-forms}.") + (license license:expat))) + (define-public python-django (package (name "python-django") @@ -734,17 +794,27 @@ queries done via the Django ORM, SQLAlchemy generated queries are displayed.") (version "1.4.5") (source (origin - (method url-fetch) - (uri (pypi-uri "django-gravatar2" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/twaddington/django-gravatar") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0r03m1qkh56g92x136xdq8n92mj7gbi1fh0djarxhp9rbr35dfrd")))) - (build-system python-build-system) + (base32 "0brh1176gx758cimkz36g8v760a1hadxspqanp8kc59kvx50qvm0")))) + (build-system pyproject-build-system) (arguments - '(;; TODO: The django project for the tests is missing from the release. - #:tests? #f)) - (inputs - (list python-django)) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "example_project" + (invoke "python" "./manage.py" "test" + "-k" "not test_has_gravatar" + "django_gravatar")))))))) + (native-inputs (list python-setuptools)) + (inputs (list python-django)) (home-page "https://github.com/twaddington/django-gravatar") (synopsis "Gravatar support for Django, improved version") (description @@ -947,20 +1017,27 @@ for Django sites.") (define-public python-django-contrib-comments (package (name "python-django-contrib-comments") - (version "1.9.2") - (source (origin - (method url-fetch) - (uri (pypi-uri "django-contrib-comments" version)) - (sha256 - (base32 - "0ccdiv784a5vnpfal36km4dyg12340rwhpr0riyy0k89wfnjn8yi")))) - (build-system python-build-system) - (propagated-inputs - (list python-django python-six)) + (version "2.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/django/django-contrib-comments") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "17mymw64bm5f19iq6dlpcbbycamy2a0wrnfzrbnw8diysc3fsnpr")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-backend #~'custom + #:test-flags #~(list "tests/runtests.py"))) + (native-inputs (list python-setuptools tzdata-for-tests)) + (propagated-inputs (list python-django)) (home-page "https://github.com/django/django-contrib-comments") (synopsis "Comments framework") (description - "Django used to include a comments framework; since Django 1.6 it's been + "Django used to include a comments framework; since Django 1.6 it's been separated to a separate project. This is that project. This framework can be used to attach comments to any model, so you can use it for comments on blog entries, photos, book chapters, or anything else.") @@ -1530,22 +1607,43 @@ a single block.") (define-public python-django-crispy-forms (package (name "python-django-crispy-forms") - (version "1.9.2") + (version "2.4") (source (origin - (method url-fetch) - (uri (pypi-uri "django-crispy-forms" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/django-crispy-forms/django-crispy-forms") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0fxlf233f49hjax786p4r650rd0ilvhnpyvw8hv1d1aqnkxy1wgj")))) - (build-system python-build-system) + (base32 "1xrrcsv534p989hh1jgy4nk6sxay7g913z6zxwgpgnadzr9dfpk1")))) + (build-system pyproject-build-system) (arguments - '(;; No included tests - #:tests? #f)) - (propagated-inputs - (list python-django)) - (home-page - "http://github.com/maraujop/django-crispy-forms") + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + (setenv "PYTHONPATH" ".")))))) + (native-inputs + (append + ;; XXX: python-crispy-boostrap packages and this package have a + ;; circular dependency. Get a bootstrap version for them. + (map (lambda (pkg) + (package/inherit pkg + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (delete 'sanity-check)))) + (propagated-inputs + (modify-inputs (package-propagated-inputs pkg) + (delete "python-django-crispy-forms"))))) + (list python-crispy-bootstrap3 python-crispy-bootstrap4)) + (list python-pytest python-pytest-django python-setuptools))) + (propagated-inputs (list python-django)) + (home-page "https://github.com/django-crispy-forms/django-crispy-forms") (synopsis "Tool to control Django forms without custom templates") (description "@code{django-crispy-forms} lets you easily build, customize and reuse @@ -1660,27 +1758,27 @@ Amazon S3, Dropbox, local file storage or any Django storage.") (define-public python-django-override-storage (package (name "python-django-override-storage") - (version "0.3.0") - (home-page "https://github.com/danifus/django-override-storage") + (version "0.3.2") (source (origin (method git-fetch) (uri (git-reference - (url home-page) + (url "https://github.com/danifus/django-override-storage") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "081kzfk7mmybhihvc92d3hsdg0r2k20ydq88fs1fgd348sq1ax51")))) - (build-system python-build-system) + (base32 "1zxfzawhcm1lnxl0d025z6ipgfarvqr2jyl4cg7680gs73m5ikw5")))) + (build-system pyproject-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "python" "runtests.py")))))) - (native-inputs - (list python-mock)) - (propagated-inputs - (list python-django)) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "python" "runtests.py")))))) + (native-inputs (list python-mock python-setuptools)) + (propagated-inputs (list python-django)) + (home-page "https://github.com/danifus/django-override-storage") (synopsis "Django test helpers to manage file storage side effects") (description "This project provides tools to help reduce the side effects of using @@ -1771,19 +1869,25 @@ backends in a single library.") (define-public python-django-logging-json (package (name "python-django-logging-json") - (version "1.15") - (source (origin - (method url-fetch) - (uri (pypi-uri "django-logging-json" version)) - (sha256 - (base32 - "06041a8icazzp73kg93c7k1ska12wvkq7fpcad0l0sm1qnxx5yx7")))) - (build-system python-build-system) + (version "1.16") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cipriantarta/django-logging") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1big7mv0274wgbr06v2qlq61pzh7h2rcn0la212shnh5b4fvhg56")))) + (build-system pyproject-build-system) (arguments - '(#:tests? #f ;no tests - #:phases (modify-phases %standard-phases - ;; Importing this module requires a Django project. - (delete 'sanity-check)))) + (list + #:tests? #f ;no tests + #:phases + #~(modify-phases %standard-phases + ;; Importing this module requires a Django project. + (delete 'sanity-check)))) + (native-inputs (list python-setuptools)) (propagated-inputs (list python-certifi python-django python-elasticsearch python-six)) (home-page "https://github.com/cipriantarta/django-logging") @@ -1798,14 +1902,30 @@ to ElasticSearch.") (package (name "python-django-netfields") (version "1.3.2") - (source (origin - (method url-fetch) - (uri (pypi-uri "django-netfields" version)) - (sha256 - (base32 - "0q2s6b689hwql4qcw02m3zj2fwsx1w4ffhw81yvp71dq3dh46jg5")))) - (build-system python-build-system) - (arguments '(#:tests? #f)) ;XXX: Requires a running PostgreSQL server + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jimfunk/django-postgresql-netfields") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "176dmdlhd6bka4k6b4mlha3ags6mqf2qy3rxvpgnk9v5nncqm7l9")))) + (build-system pyproject-build-system) + (arguments + (list + #:tests? #f ;XXX: Requires a running PostgreSQL server + ;; XXX: Requires rest_framework. + #:test-flags + #~(list "--ignore=test/tests/test_rest_framework_fields.py") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + (setenv "DJANGO_SETTINGS_MODULE" "testsettings") + (setenv "PYTHONPATH" ".")))))) + (native-inputs + (list python-pytest python-pytest-django python-setuptools)) (propagated-inputs (list python-django python-netaddr python-psycopg2 python-six)) (home-page "https://github.com/jimfunk/django-postgresql-netfields") @@ -1819,48 +1939,46 @@ to ElasticSearch.") (package (name "python-django-url-filter") (version "0.3.15") - (home-page "https://github.com/miki725/django-url-filter") - (source (origin - (method git-fetch) - (uri (git-reference (url home-page) (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0r4zhqhs8y6cnplwyvcb0zpijizw1ifnszs38n4w8138657f9026")) - (modules '((guix build utils))) - (snippet - ;; Patch for Django 4.0 compatibility, taken from upstream pull - ;; request: https://github.com/miki725/django-url-filter/pull/103 - '(substitute* "url_filter/validators.py" - ((" ungettext_lazy") - " ngettext_lazy"))))) - (build-system python-build-system) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/miki725/django-url-filter") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0r4zhqhs8y6cnplwyvcb0zpijizw1ifnszs38n4w8138657f9026")))) + (build-system pyproject-build-system) (arguments - '(#:tests? #f ;FIXME: Django raises "Apps aren't loaded yet"!? - #:phases (modify-phases %standard-phases - (add-after 'unpack 'loosen-requirements - (lambda _ - ;; Do not depend on compatibility package for old - ;; Python versions. - (substitute* "requirements.txt" - (("enum-compat") "")))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (if tests? - (begin - (setenv "DJANGO_SETTINGS_MODULE" - "test_project.settings") - (invoke "pytest" "-vv" "--doctest-modules" - "tests/" "url_filter/")) - (format #t "test suite not run~%"))))))) - (propagated-inputs - (list python-cached-property python-django python-six)) + (list + #:tests? #f ;FIXME: Django raises "Apps aren't loaded yet"!? + #:test-flags #~(list "--doctest-modules" "tests/" "url_filter/") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'loosen-requirements + (lambda _ + ;; Do not depend on compatibility package for old + ;; Python versions. + (substitute* "requirements.txt" + (("enum-compat") + "")) + ;; Patch for Django 4.0 compatibility, taken from upstream pull + ;; request: https://github.com/miki725/django-url-filter/pull/103 + (substitute* "url_filter/validators.py" + ((" ungettext_lazy") + " ngettext_lazy")))) + (add-before 'check 'configure-tests + (lambda _ + (setenv "DJANGO_SETTINGS_MODULE" "test_project.settings")))))) + (native-inputs (list python-mock python-pytest python-setuptools python-sqlalchemy)) + (propagated-inputs (list python-cached-property python-django python-six)) + (home-page "https://github.com/miki725/django-url-filter") (synopsis "Filter data via human-friendly URLs") (description "The main goal of Django URL Filter is to provide an easy URL interface for filtering data. It allows the user to safely filter by model attributes -and also specify the lookup type for each filter (very much like -Django's filtering system in ORM).") +and also specify the lookup type for each filter (very much like Django's +filtering system in ORM).") (license license:expat))) (define-public python-django-svg-image-form-field @@ -1876,7 +1994,9 @@ Django's filtering system in ORM).") (file-name (git-file-name name version)) (sha256 (base32 "131m545khn8l20j4x2bvlvz36dlbnhj9pc98i2dw72s3bw8pgws0")))) - (build-system python-build-system) + (build-system pyproject-build-system) + (arguments (list #:tests? #f)) ; No tests. + (native-inputs (list python-setuptools)) (propagated-inputs (list python-defusedxml python-django python-pillow)) (home-page "https://github.com/artrey/django-svg-image-form-field") diff --git a/gnu/packages/easyrpg.scm b/gnu/packages/easyrpg.scm index 751080c33f3..2d227f8956e 100644 --- a/gnu/packages/easyrpg.scm +++ b/gnu/packages/easyrpg.scm @@ -20,9 +20,12 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages easyrpg) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (gnu packages audio) #:use-module (gnu packages compression) @@ -116,3 +119,37 @@ data.") ;; and WAV audio loader and writer (public-domain): ;; src/external/dr_wav.h (license license:gpl3+))) + +(define-public libretro-easyrpg + (let ((libretro-common + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libretro/libretro-common") + (commit "668749ae38a9e85744d1c15a652a1e8db8ab9e82"))) + (file-name "libretro-common-checkout") + (sha256 + (base32 + "007hd1ys3ikyjx4zigkxl2h0172p7d9p9vj09739yqfkvxkwlbl2"))))) + (package + (inherit easyrpg-player) + (name "libretro-easyrpg") + (source (origin + (inherit (package-source easyrpg-player)) + (modules '((guix build utils))) + (snippet + #~(begin + (copy-recursively #$libretro-common + "builds/libretro/libretro-common"))))) + (build-system cmake-build-system) + (arguments + (list #:tests? #f ;no tests + #:configure-flags #~'("-DPLAYER_TARGET_PLATFORM=libretro") + #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda _ + (install-file + "easyrpg_libretro.so" + (string-append #$output "/lib/libretro/"))))))) + (synopsis "Libretro core to play RPG Maker 2000 and 2003 games")))) diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index f2ae337ee67..4b7f63af7b0 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -975,7 +975,7 @@ which allows one to install the M8 firmware on any Teensy.") (define-public nvc (package (name "nvc") - (version "1.17.2") + (version "1.18.0") (source (origin (method git-fetch) (uri (git-reference @@ -984,7 +984,7 @@ which allows one to install the M8 firmware on any Teensy.") (file-name (git-file-name name version)) (sha256 (base32 - "0hr5y9ys5kf096x18mh10wwqa0hbzlmdj7pyayc6szsjla1d3mk0")))) + "1b8bsmxv2p9v8g7yzdj8s22l5bx9n58kmbklgnj17gd362lai51y")))) (build-system gnu-build-system) (arguments (list #:out-of-source? #t @@ -1299,7 +1299,7 @@ GUI for sigrok.") (define-public osvvm (package (name "osvvm") - (version "2025.06") + (version "2025.06a") (source (origin (method git-fetch) @@ -1311,7 +1311,7 @@ GUI for sigrok.") (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "08mfh7pyrb26mp8wx3xjns79slb3yf1c78nf8y1awvxc1p8q1wq4")))) + (base32 "1dq56h51ydfpffd00qz9qkcg6sddlqixiixls9vvxczfkp9l21ws")))) (outputs '("out" "common" "scripts" "uart" "axi4")) (properties @@ -1726,6 +1726,10 @@ to enforce it.") (build-system pyproject-build-system) (arguments (list + #:modules '((guix build pyproject-build-system) + (guix build utils) + (ice-9 ftw) + (srfi srfi-26)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-ghdl-jit @@ -1751,14 +1755,27 @@ to enforce it.") (string-append site-packages "osvvm"))))) (add-after 'check 'run-examples ;; Run examples as an extra check. - (lambda* (#:key inputs outputs #:allow-other-keys) - (with-directory-excursion "examples/vhdl" - (for-each - (lambda (dir) - (invoke "python3" (string-append dir "/run.py"))) - (list - "array" "check" "composite_generics" "json4vhdl" "logging" - "logging" "uart" "vhdl_configuration")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "examples/vhdl" + (for-each + (lambda (dir) + (invoke "python3" (string-append dir "/run.py")) + (delete-file-recursively "vunit_out")) + (scandir "." + (negate + (cut member <> + '("coverage" ;unsupported feature in nvc + "data_types" ;no run.py + "docker_runall.sh" ;not a test + "vivado" ;requires external tool + ;; Fails with nvc + "array_axis_vcs" + "osvvm_log_integration" + "run" + "third_party_integration" + "user_guide" + "." "..")))))))))) #:test-flags ;; Skip lint tests which require python-pycodestyle, python-pylint and ;; python-mypy to reduce closoure size; some lint test fails, see diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 08dbae8c4f2..00bc697b59e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5287,6 +5287,33 @@ customizability and asynchronous upgrading.") listing type errors via Flycheck, as well as REPL support for Carp.") (license license:asl2.0)))) +(define-public emacs-cond-let + (package + (name "emacs-cond-let") + (version "0.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tarsius/cond-let/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hsxl42dysbrkmgnbd954zjv28cms73r7nask5ip4f07qzgaj1gi")))) + (build-system emacs-build-system) + (arguments + (list + #:test-command + #~(list "emacs" "--batch" + "-l" "cond-let-tests.el" + "-f" "ert-run-tests-batch-and-exit"))) + (home-page "https://github.com/tarsius/cond-let/") + (synopsis "Additional and improved binding conditionals") + (description "This package implements binding conditionals @code{and-let} +and @code{while-let*}, and the original @code{cond-let}, @code{cond-let*}, +@code{and$} and @code{and>}.") + (license license:gpl3+))) + (define-public emacs-coterm (package (name "emacs-coterm") @@ -36132,7 +36159,7 @@ commands (a prefix and a suffix) we prefer to call it just a \"transient\".") (define-public emacs-forge (package (name "emacs-forge") - (version "0.5.3") + (version "0.6.0") (source (origin (method git-fetch) @@ -36141,28 +36168,30 @@ commands (a prefix and a suffix) we prefer to call it just a \"transient\".") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1vr7qrrcj2vdh5h3w43jzqym33ax58218jq3idjrr8wnlh7vdj18")))) + (base32 "17x7rvlnpdk6f0c96x0m3lgd89znzysqc9184m442w9p9swp93j1")))) (build-system emacs-build-system) (arguments - `(#:tests? #f ;no tests - #:lisp-directory "lisp" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'build-info-manual - (lambda _ - (with-directory-excursion ".." - (invoke "make" "info") - ;; Move the info file to lisp so that it gets installed by the - ;; emacs-build-system. - (rename-file "docs/forge.info" "lisp/forge.info"))))))) + (list + #:tests? #f ;no tests + #:lisp-directory "lisp" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'build-info-manual + (lambda _ + (with-directory-excursion ".." + (invoke "make" "info") + ;; Move the info file to lisp so that it gets installed by the + ;; emacs-build-system. + (rename-file "docs/forge.info" "lisp/forge.info"))))))) (native-inputs (list texinfo)) (propagated-inputs (list emacs-closql + emacs-compat + emacs-cond-let emacs-emacsql emacs-ghub emacs-llama - emacs-let-alist emacs-magit emacs-markdown-mode emacs-yaml)) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 242477f5d4e..e1c4f8598ef 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1617,7 +1617,7 @@ Luhn and family of ISO/IEC 7064 check digit algorithms.") (base32 "1ysh9b5lzg053hv4iw3zbn7hid05qssiwmrl8sir8qlk958r8x60")))) (build-system pyproject-build-system) (native-inputs - (list python-poetry-core-next + (list python-poetry-core python-pytest)) (propagated-inputs (list python-base58 diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 0e50ec7a444..aaceb84119b 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -816,7 +816,6 @@ the OpenCV-Python library.") libpng (librsvg-for-system) libtiff - libxml2 libwebp matio openexr diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 8e8b4c9d088..933ede23ac9 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -4979,7 +4979,7 @@ in the audio domain.") python-xxhash)) (native-inputs (list openssl - python-flit-core-next + python-flit-core python-pytest python-pytest-cov)) (home-page "https://pyg.org") diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 2018424c7d1..4794773fa51 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -656,14 +656,14 @@ command-line tool.") (define-public chromaprint (package (name "chromaprint") - (version "1.5.1") + (version "1.6.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/acoustid/chromaprint/releases/download/v" version "/chromaprint-" version ".tar.gz")) (sha256 - (base32 "072y6c7ijkm6r674f6z089rbdazrmxzpdcsm6y6vf64b7gxdiam1")))) + (base32 "1nj0rfr3vf926802jgd6p3il7yirc4vjqx6nl0vrlf51aqp4hcwx")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; tests require googletest *sources* @@ -672,7 +672,7 @@ command-line tool.") (inputs ;; requires one of FFmpeg (prefered), FFTW3 or vDSP ;; use the same ffmpeg version as for acoustid-fingerprinter - (list ffmpeg-4 boost)) + (list ffmpeg boost)) (home-page "https://acoustid.org/chromaprint") (synopsis "Audio fingerprinting library") (description "Chromaprint is a library for calculating audio diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 7ed5915ae8a..0472c2d55ca 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4052,7 +4052,7 @@ event-based scripts for scrobbling, notifications, etc.") (list gettext-minimal python-dateutil)) (inputs (list chromaprint - python-charset-normalizer-3 + python-charset-normalizer python-discid python-pyqt python-mutagen diff --git a/gnu/packages/patches/aoflagger-use-system-provided-pybind11.patch b/gnu/packages/patches/aoflagger-use-system-provided-pybind11.patch deleted file mode 100644 index 76bc52a4bae..00000000000 --- a/gnu/packages/patches/aoflagger-use-system-provided-pybind11.patch +++ /dev/null @@ -1,38 +0,0 @@ -This patch was borrowed from Debian's package: -https://salsa.debian.org/debian-astro-team/aoflagger/-/blob/0484ef75a663e3e07738550cdade46f433a53dac/debian/patches/Use-system-provided-pybind11.patch -Description: Use system provided pybind11 -Author: Ole Streicher -Origin: Debian -Last-Update: Mon, 30 Aug 2021 11:05:37 +0200 ---- - CMakeLists.txt | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 655ea5e..824ee2a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -62,11 +62,6 @@ foreach(ExternalSubmodule IN LISTS ExternalSubmoduleDirectories) - endif() - endforeach() - --# Include aocommon/pybind11 headers --include_directories("${CMAKE_SOURCE_DIR}/external/aocommon/include") --add_subdirectory("${CMAKE_SOURCE_DIR}/external/pybind11") --include_directories(SYSTEM ${pybind11_INCLUDE_DIR}) -- - find_package( - HDF5 - COMPONENTS C CXX -@@ -101,6 +96,11 @@ find_package(PythonInterp REQUIRED) - message(STATUS "Using python version ${PYTHON_VERSION_STRING}") - include_directories(SYSTEM ${PYTHON_INCLUDE_DIRS}) - -+# Include pybind11 headers -+find_package(pybind11 REQUIRED) -+include_directories("${CMAKE_SOURCE_DIR}/external/aocommon/include") -+include_directories(${pybind11_INCLUDE_DIR}) -+ - # boost::alignment requires Boost 1.56 - find_package(Boost 1.56.0 REQUIRED COMPONENTS date_time filesystem system - unit_test_framework) diff --git a/gnu/packages/patches/python-scipy-i686.patch b/gnu/packages/patches/python-scipy-i686.patch new file mode 100644 index 00000000000..66b5898c177 --- /dev/null +++ b/gnu/packages/patches/python-scipy-i686.patch @@ -0,0 +1,49 @@ +From https://github.com/scipy/scipy/pull/20135 + +From 53796772ed735c1564863fc7ca8d902acb628167 Mon Sep 17 00:00:00 2001 +From: Ralf Gommers +Date: Thu, 22 Feb 2024 09:10:46 +0100 +Subject: [PATCH] MAINT: interpolate: define `F_INT` as `int` rather than + `npy_int32` + +This fixes an incompatible pointer issue that shows up as a warning in +Windows CI jobs, and is reported to break the build with GCC 14 on +Fedora 40 in gh-19993. + +Using `#define F_INT int` is done in several other submodules; this +was the only instance of using `npy_int32`. + +Closes gh-19993 +--- + scipy/interpolate/src/_fitpackmodule.c | 4 ++-- + scipy/interpolate/src/fitpack.pyf | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/scipy/interpolate/src/_fitpackmodule.c b/scipy/interpolate/src/_fitpackmodule.c +index 0e913d1c7e43..dc79b2b28833 100644 +--- a/scipy/interpolate/src/_fitpackmodule.c ++++ b/scipy/interpolate/src/_fitpackmodule.c +@@ -28,8 +28,8 @@ static PyObject *fitpack_error; + + #else + +-#define F_INT npy_int32 +-#define F_INT_NPY NPY_INT32 ++#define F_INT int ++#define F_INT_NPY NPY_INT + #define F_INT_MAX NPY_MAX_INT32 + #if NPY_BITSOF_SHORT == 32 + #define F_INT_PYFMT "h" +diff --git a/scipy/interpolate/src/fitpack.pyf b/scipy/interpolate/src/fitpack.pyf +index 08cb0c141c98..a9535a83f479 100644 +--- a/scipy/interpolate/src/fitpack.pyf ++++ b/scipy/interpolate/src/fitpack.pyf +@@ -16,7 +16,7 @@ python module dfitpack ! in + #ifdef HAVE_ILP64 + typedef npy_int64 F_INT; + #else +-typedef npy_int32 F_INT; ++typedef int F_INT; + #endif + + static double dmax(double* seq, F_INT len) { diff --git a/gnu/packages/patches/readymedia-ffmpeg7.patch b/gnu/packages/patches/readymedia-ffmpeg7.patch new file mode 100644 index 00000000000..e1c9593e274 --- /dev/null +++ b/gnu/packages/patches/readymedia-ffmpeg7.patch @@ -0,0 +1,15 @@ +https://gitlab.archlinux.org/archlinux/packaging/packages/minidlna/-/raw/affcf0dd1e6f8e33d0ba90b2b0733736fa1aeb71/ffmpeg7.patch + +diff --git a/libav.h b/libav.h +index b69752c..aed9d18 100644 +--- a/libav.h ++++ b/libav.h +@@ -174,7 +174,7 @@ lav_get_interlaced(AVStream *s) + #define lav_codec_tag(s) s->codecpar->codec_tag + #define lav_sample_rate(s) s->codecpar->sample_rate + #define lav_bit_rate(s) s->codecpar->bit_rate +-#define lav_channels(s) s->codecpar->channels ++#define lav_channels(s) s->codecpar->ch_layout.nb_channels + #define lav_width(s) s->codecpar->width + #define lav_height(s) s->codecpar->height + #define lav_profile(s) s->codecpar->profile diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 81ff1d528b0..dba033cf823 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -1484,7 +1484,7 @@ converter using the Poppler and Cairo libraries.") " and not ")))) (native-inputs (list python-flit - python-flit-core-next + python-flit-core python-pytest python-pytest-socket python-pytest-timeout diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 3d6dbb383bd..2e45fc84d2e 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -36,6 +36,7 @@ #:use-module (guix build-system python) #:use-module (guix build-system pyproject) #:use-module (guix gexp) + #:use-module (guix deprecation) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages)) @@ -237,7 +238,8 @@ Included are implementations of: @end enumerate\n") (license license:psfl))) -(define-public python-typing-extensions-next python-typing-extensions) +(define-deprecated/public-alias python-typing-extensions-next + python-typing-extensions) ;may be removed after 2025-12-01 ;;; @@ -349,7 +351,8 @@ facilitate packaging Python projects, where packaging includes: (native-inputs (list python-wheel-0.40)))) -(define-public python-setuptools-next python-setuptools) +(define-deprecated/public-alias python-setuptools-next + python-setuptools) ;may be removed after 2025-12-01 (define-public python-wheel (package @@ -560,7 +563,8 @@ a light weight, fully compliant, self-contained package allowing PEP 517 compatible build front-ends to build Poetry managed projects.") (license license:expat))) -(define-public python-poetry-core-next python-poetry-core) +(define-deprecated/public-alias python-poetry-core-next + python-poetry-core) ;may be removed after 2025-12-01 ;;; This package exists to bootstrap python-tomli. (define-public python-flit-core-bootstrap @@ -614,7 +618,8 @@ specified by PEP 517, @code{flit_core.buildapi}.") (delete "python-toml") (prepend python-tomli))))) -(define-public python-flit-core-next python-flit-core) +(define-deprecated/public-alias python-flit-core-next + python-flit-core) ;may be removed after 2025-12-01 (define-public python-flit-scm (package @@ -682,7 +687,8 @@ system, then @code{flit_core} to build the package.") them as the version argument or in a SCM managed file.") (license license:expat))) -(define-public python-setuptools-scm-next python-setuptools-scm) +(define-deprecated/public-alias python-setuptools-scm-next + python-setuptools-scm) ;may be removed after 2025-12-01 (define-public python-editables (package diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index e40b92f5083..72d4775abf6 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -1834,6 +1834,31 @@ data arrays produced during tests, in particular in cases where the arrays are too large to conveniently hard-code them in the tests.") (license license:bsd-3))) +(define-public python-pytest-asdf-plugin + (package + (name "python-pytest-asdf-plugin") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest_asdf_plugin" version)) + (sha256 + (base32 "0bcfl1s7yrnr2rlpr3hswcg9jyq6gnj0ppmpzppw9xgj796ycfb5")))) + (build-system pyproject-build-system) + (arguments + (list #:tests? #f ;to avoid import astronomy module + #:phases + #~(modify-phases %standard-phases + (delete 'sanity-check)))) + (native-inputs + (list python-setuptools-next + python-setuptools-scm-next)) + (home-page "https://github.com/asdf-format/pytest-asdf-plugin") + (synopsis "Pytest plugin for testing ASDF schemas") + (description + "This package provides a Pytest plugin for testing ASDF schemas.") + (license license:bsd-3))) + (define-public python-pytest-astropy (package (name "python-pytest-astropy") @@ -3758,7 +3783,7 @@ possibly work.") (native-inputs (list python-ddt python-iso8601 - python-flit-core-next ;requires >=3.12 + python-flit-core python-setuptools)) (propagated-inputs (list python-cliff-bootstrap diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index b20bec061fd..938fe82480f 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -627,7 +627,7 @@ OpenSSL library.") (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? (invoke "python" "test_ed25519_kat.py"))))))) - (native-inputs (list python-setuptools-next)) + (native-inputs (list python-setuptools)) (home-page "https://github.com/warner/python-ed25519") (synopsis "Ed25519 public-key signatures") (description diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index ad89a3940ae..c4399c9019e 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -3108,6 +3108,15 @@ cross-validation.") (list #:phases #~(modify-phases %standard-phases + #$@(if (target-x86-32?) + #~((add-after 'unpack 'apply-i686-patch + (lambda _ + (let ((patch-file + #$(local-file + (search-patch "python-scipy-i686.patch")))) + (invoke "patch" "--force" "-p1" "-i" + patch-file))))) + #~()) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 61f53e89d5f..adea9889b26 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -80,6 +80,7 @@ ;;; Copyright © 2025 Jake Forster ;;; Copyright © 2025 Janneke Nieuwenhuizen ;;; Copyright © 2025 Hugo Buddelmeijer +;;; Copyright © 2025 Artur Wroblewski ;;; ;;; This file is part of GNU Guix. ;;; @@ -102,6 +103,7 @@ #:use-module (guix build-system copy) #:use-module (guix build-system pyproject) #:use-module (guix build-system python) + #:use-module (guix deprecation) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix git-download) @@ -250,7 +252,7 @@ SNS, Gotify, etc.") (define-public python-blacksheep (package (name "python-blacksheep") - (version "2.4.0") + (version "2.4.1") (source (origin (method git-fetch) @@ -259,20 +261,16 @@ SNS, Gotify, etc.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1iwlj6vl0rnvddbn9zsdgpya88z0lifr86wz3ci1d67li7w5bjiq")))) + (base32 "0znkqj4cipdr1qdsdlbb48b82cpvj24dqiwi0nyiy50b8nd7g5np")))) (build-system pyproject-build-system) (arguments (list - ;; tests: 1443 passed, 3 skipped + ;; tests: 1609 passed, 3 skipped ;; - ;; 1. Ignore integration tests. - ;; 2. Client tests use test fixture no longer available in - ;; pytest-asyncio, - ;; - ;; See: . + ;; Run all unit tests, but do not run integration tests from `itests` + ;; directory. #:test-flags - #~(list "--ignore=itests" - "--ignore=tests/client") + #~(list "tests") #:phases #~(modify-phases %standard-phases (add-before 'build 'cythonize @@ -282,7 +280,8 @@ SNS, Gotify, etc.") (invoke "cython" "-3" file "-I" ".")) (find-files "." ".*\\.pyx$")))))))) (native-inputs - (list python-cython + (list nss-certs-for-test + python-cython python-flask python-jinja2 python-pydantic @@ -292,7 +291,6 @@ SNS, Gotify, etc.") python-setuptools)) (propagated-inputs (list python-certifi - python-dateutil python-essentials-openapi python-guardpost python-itsdangerous)) @@ -5603,7 +5601,8 @@ APIs.") than Python’s urllib2 library.") (license license:asl2.0))) -(define-public python-requests-next python-requests) +(define-deprecated/public-alias python-requests-next + python-requests) ;may be removed after 2025-12-01 (define-public python-requests-kerberos (package @@ -6024,7 +6023,8 @@ can reuse the same socket connection for multiple requests, it can POST files, supports url redirection and retries, and also gzip and deflate decoding.") (license license:expat))) -(define-public python-urllib3-next python-urllib3) +(define-deprecated/public-alias python-urllib3-next + python-urllib3) ;may be removed after 2025-12-01 (define-public python-urllib3-1.25 (package @@ -8619,7 +8619,7 @@ for HTTP/2 is planned.") (list python-pytest python-setuptools)) (propagated-inputs - (list python-charset-normalizer-3 + (list python-charset-normalizer python-ruamel.yaml python-weblate-language-data)) (home-page "https://weblate.org/") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 106b46ad25e..f540fc6fa23 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -411,7 +411,7 @@ APIs to detect, query, and compare them.") (("from click") "from asyncclick"))))))) (native-inputs (list python-anyio - python-flit-core-next + python-flit-core python-pytest python-trio)) (home-page "https://github.com/python-trio/asyncclick") @@ -19853,7 +19853,8 @@ taking a new approach. All IANA character set names for which the Python core library provides codecs are supported.") (license license:expat))) -(define-public python-charset-normalizer-3 python-charset-normalizer) +(define-deprecated/public-alias python-charset-normalizer-3 + python-charset-normalizer) ;may be removed after 2025-12-01 (define-public python-docopt (package diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index e13c73e3cb3..5fbea716dba 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -4372,9 +4372,9 @@ Python.") (arguments (list #:tests? #f)) ; No test system found. (native-inputs - (list python-setuptools-next python-setuptools-scm-next python-wheel)) + (list python-setuptools python-setuptools-scm python-wheel)) (propagated-inputs - (list python-packaging python-setuptools-next python-tomli)) + (list python-packaging python-setuptools python-tomli)) (home-page "https://www.riverbankcomputing.com/software/sip/intro") (synopsis "Python binding creator for C and C++ libraries") (description @@ -4724,8 +4724,8 @@ set of three modules."))) (base32 "1g40j5iyad8bw8113rsxxkbkdi7g1lcjj0lb1j7pma442i3fmpsn")))) (build-system pyproject-build-system) - (native-inputs (list python-setuptools-next - python-setuptools-scm-next + (native-inputs (list python-setuptools + python-setuptools-scm python-wheel)) (inputs (list python-sip)) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index fdfd8ea6050..0caad56e8a3 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -1317,7 +1317,7 @@ OpenDocument presentations (*.odp).") python-pytest python-pytest-asyncio python-pytest-textual-snapshot - python-setuptools-next)) + python-setuptools)) (propagated-inputs (list python-beautifulsoup4 python-bibtexparser diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index f9596e3331d..0cb9e597d6f 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -148,7 +148,8 @@ and others.") "v" (string-replace-substring version "." "_"))))) (file-name (git-file-name name version)) (sha256 - (base32 "1al04jx72bxwqch1nv9lx536mb6pvj7pgnqzy6lm32q6xa114yr2")))) + (base32 "1al04jx72bxwqch1nv9lx536mb6pvj7pgnqzy6lm32q6xa114yr2")) + (patches (search-patches "readymedia-ffmpeg7.patch")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8e2f429df11..e7af1b46846 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1902,7 +1902,7 @@ audio/video codec library.") (define-public ffmpeg-5 (package - (inherit ffmpeg) + (inherit ffmpeg-6) (version "5.1.6") (source (origin (method url-fetch) @@ -1912,7 +1912,7 @@ audio/video codec library.") (base32 "1g8116rp4fgq82br8lclb2dmw3fvyh2zkzhnngm7z97pg1i0dypl")))) (arguments - (substitute-keyword-arguments (package-arguments ffmpeg) + (substitute-keyword-arguments (package-arguments ffmpeg-6) ((#:modules modules %default-gnu-modules) `((srfi srfi-1) ,@modules)) ((#:phases phases) @@ -1926,7 +1926,7 @@ audio/video codec library.") phases)) ((#:configure-flags flags ''()) #~(fold delete #$flags '("--enable-libplacebo"))))) - (inputs (modify-inputs (package-inputs ffmpeg) + (inputs (modify-inputs (package-inputs ffmpeg-6) (delete "libplacebo"))))) (define-public ffmpeg-4 @@ -1940,8 +1940,6 @@ audio/video codec library.") (sha256 (base32 "05q6bpid5hfr9djp6cf3sq8majkjiqnl3v9i2y0an23w8qgld412")))) - (inputs (modify-inputs (package-inputs ffmpeg-5) - (replace "sdl2" sdl2-2.0))) (arguments (substitute-keyword-arguments (package-arguments ffmpeg-5) ((#:configure-flags flags ''()) diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm index 8f24950752f..20e4517c667 100644 --- a/gnu/services/admin.scm +++ b/gnu/services/admin.scm @@ -57,26 +57,6 @@ log-rotation-configuration-size-threshold log-rotation-service-type - %default-rotations - %rotated-files - - log-rotation - log-rotation? - log-rotation-frequency - log-rotation-files - log-rotation-options - log-rotation-post-rotate - %default-log-rotation-options - - rottlog-configuration - rottlog-configuration? - rottlog-configuration-rottlog - rottlog-configuration-rc-file - rottlog-configuration-rotations - rottlog-configuration-jobs - rottlog-service - rottlog-service-type - log-cleanup-service-type log-cleanup-configuration log-cleanup-configuration? @@ -218,149 +198,6 @@ log-rotation} to list files subject to log rotation.") log-files))))) (default-value (log-rotation-configuration)))) - -;;; -;;; Rottlog + mcron. -;;; - -(define-record-type* log-rotation make-log-rotation - log-rotation? - (files log-rotation-files) ;list of strings - (frequency log-rotation-frequency ;symbol - (default 'weekly)) - (post-rotate log-rotation-post-rotate ;#f | gexp - (default #f)) - (options log-rotation-options ;list of strings - (default %default-log-rotation-options))) - -(define %default-log-rotation-options - ;; Default log rotation options: append ".gz" to file names. - '("storefile @FILENAME.@COMP_EXT" - "notifempty")) - -(define %rotated-files - ;; Syslog files subject to rotation. - '("/var/log/messages" "/var/log/secure" "/var/log/debug" - "/var/log/maillog" "/var/log/mcron.log")) - -(define %default-rotations - (list (log-rotation ;syslog files - (files %rotated-files) - - (frequency 'weekly) - (options `(;; These files are worth keeping for a few weeks. - "rotate 16" - ;; Run post-rotate once per rotation - "sharedscripts" - - ,@%default-log-rotation-options)) - ;; Restart syslogd after rotation. - (post-rotate #~(let ((pid (call-with-input-file "/var/run/syslog.pid" - read))) - (kill pid SIGHUP)))) - (log-rotation - (files '("/var/log/guix-daemon.log")) - (options `("rotate 4" ;don't keep too many of them - ,@%default-log-rotation-options))))) - -(define (log-rotation->config rotation) - "Return a string-valued gexp representing the rottlog configuration snippet -for ROTATION." - (define post-rotate - (let ((post (log-rotation-post-rotate rotation))) - (and post - (program-file "rottlog-post-rotate.scm" post)))) - - #~(let ((post #$post-rotate)) - (string-append (string-join '#$(log-rotation-files rotation) ",") - " {" - #$(string-join (log-rotation-options rotation) - "\n " 'prefix) - (if post - (string-append "\n postrotate\n " post - "\n endscript\n") - "") - "\n}\n"))) - -(define (log-rotations->/etc-entries rotations) - "Return the list of /etc entries for ROTATIONS, a list of ." - (define (frequency-file frequency rotations) - (computed-file (string-append "rottlog." (symbol->string frequency)) - #~(call-with-output-file #$output - (lambda (port) - (for-each (lambda (str) - (display str port)) - (list #$@(map log-rotation->config - rotations))))))) - - (let* ((frequencies (delete-duplicates - (map log-rotation-frequency rotations))) - (table (fold (lambda (rotation table) - (vhash-consq (log-rotation-frequency rotation) - rotation table)) - vlist-null - rotations))) - (map (lambda (frequency) - `(,(symbol->string frequency) - ,(frequency-file frequency - (vhash-foldq* cons '() frequency table)))) - frequencies))) - -(define (default-jobs rottlog) - (list #~(job '(next-hour '(0)) ;midnight - #$(file-append rottlog "/sbin/rottlog")) - #~(job '(next-hour '(12)) ;noon - #$(file-append rottlog "/sbin/rottlog")))) - -(define-record-type* - rottlog-configuration make-rottlog-configuration - rottlog-configuration? - (rottlog rottlog-configuration-rottlog ;file-like - (default rottlog)) - (rc-file rottlog-configuration-rc-file ;file-like - (default (file-append rottlog "/etc/rc"))) - (rotations rottlog-configuration-rotations ;list of - (default %default-rotations)) - (jobs rottlog-configuration-jobs ;list of - (default #f))) - -(define (rottlog-etc config) - `(("rottlog" - ,(file-union "rottlog" - (cons `("rc" ,(rottlog-configuration-rc-file config)) - (log-rotations->/etc-entries - (rottlog-configuration-rotations config))))))) - -(define (rottlog-jobs-or-default config) - (or (rottlog-configuration-jobs config) - (default-jobs (rottlog-configuration-rottlog config)))) - -;; TODO: Deprecated; remove sometime after 2025-06-15. -(define-deprecated rottlog-service-type - log-rotation-service-type - (service-type - (name 'rottlog) - (description - "Periodically rotate log files using GNU@tie{}Rottlog and GNU@tie{}mcron. -Old log files are removed or compressed according to the configuration. - -This service is deprecated and slated for removal after 2025-06-15.") - (extensions (list (service-extension etc-service-type rottlog-etc) - (service-extension mcron-service-type - rottlog-jobs-or-default) - - ;; Add Rottlog to the global profile so users can access - ;; the documentation. - (service-extension profile-service-type - (compose list rottlog-configuration-rottlog)))) - (compose concatenate) - (extend (lambda (config rotations) - (rottlog-configuration - (inherit config) - (rotations (append (rottlog-configuration-rotations config) - rotations))))) - (default-value (rottlog-configuration)))) - ;;; ;;; Build log removal. diff --git a/po/guix/sv.po b/po/guix/sv.po index 43f8d795306..1df4a0f968b 100644 --- a/po/guix/sv.po +++ b/po/guix/sv.po @@ -8,13 +8,13 @@ # Florian Pelz , 2024, 2025. # Mikael Dúi Bolinder , 2025. # Tor-bjoern Claesson , 2025. -#: guix/diagnostics.scm:159 guix/import/composer.scm:156 +#: guix/diagnostics.scm:159 guix/import/composer.scm:182 msgid "" msgstr "" "Project-Id-Version: guix 1.2.0-pre2\n" "Report-Msgid-Bugs-To: bug-guix@gnu.org\n" -"POT-Creation-Date: 2025-09-26 03:18+0000\n" -"PO-Revision-Date: 2025-09-21 18:09+0000\n" +"POT-Creation-Date: 2025-08-26 03:18+0000\n" +"PO-Revision-Date: 2025-08-20 14:43+0000\n" "Last-Translator: Umeaman \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -22,7 +22,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 5.13.2\n" +"X-Generator: Weblate 5.12.2\n" "X-Bugs: Report translation errors to the Language-Team address.\n" #: gnu.scm:81 @@ -156,9 +156,9 @@ msgstr "" "temporära platser vid uppstart." #: gnu/services.scm:755 -#, scheme-format +#, fuzzy, scheme-format msgid "failed to activate '~a'~%" -msgstr "aktiveringen av '~a'~a~% misslyckades" +msgstr "misslyckades med att läsa in ”~a”: ~a~%" #: gnu/services.scm:787 msgid "" @@ -527,7 +527,7 @@ msgstr "" #: gnu/services/base.scm:1758 #, scheme-format msgid "invalid input for 'pam-limits-service-type'~%" -msgstr "ogiltig inmatning för 'pam-limits-service-type'~%" +msgstr "" #: gnu/services/base.scm:1769 msgid "" @@ -782,25 +782,25 @@ msgid "" "setting its password with @command{passwd}." msgstr "" -#: gnu/services/desktop.scm:2274 +#: gnu/services/desktop.scm:2272 #, fuzzy #| msgid "Desktop environment" msgid "Run the KDE Plasma desktop environment." msgstr "Skrivbordsmiljö" -#: gnu/services/desktop.scm:2331 +#: gnu/services/desktop.scm:2329 msgid "" "Return a service that runs inputattach on a device and\n" "dispatches events from it." msgstr "" -#: gnu/services/desktop.scm:2362 +#: gnu/services/desktop.scm:2360 #, fuzzy, scheme-format #| msgid "'~a' is not a valid URI~%" msgid "seatd: '~a' is not a valid group~%" msgstr "”~a” är ingen giltig URI~%" -#: gnu/services/desktop.scm:2404 +#: gnu/services/desktop.scm:2402 msgid "" "Seat management takes care of mediating access\n" "to shared devices (graphics, input), without requiring the\n" @@ -875,7 +875,7 @@ msgstr "" #: gnu/services/linux.scm:327 msgid "Load kernel modules." -msgstr "Laddar kärnmoduler." +msgstr "" #: gnu/services/linux.scm:500 msgid "" @@ -900,7 +900,7 @@ msgstr "" msgid "Creates a zram swap device." msgstr "" -#: gnu/services/linux.scm:791 +#: gnu/services/linux.scm:792 msgid "Share or expose a file name under a different name." msgstr "" @@ -977,32 +977,32 @@ msgid "" "daemon is responsible for allocating IP addresses to its client." msgstr "" -#: gnu/services/networking.scm:685 +#: gnu/services/networking.scm:680 msgid "Run the dhcpcd daemon." -msgstr "Kör hjälpprogrammet dhcpd." +msgstr "" -#: gnu/services/networking.scm:834 +#: gnu/services/networking.scm:829 msgid "" "Run the @command{ntpd}, the Network Time Protocol (NTP)\n" "daemon of the @uref{http://www.ntp.org, Network Time Foundation}. The daemon\n" "will keep the system clock synchronized with that of the given servers." msgstr "" -#: gnu/services/networking.scm:944 +#: gnu/services/networking.scm:939 msgid "" "Run the @command{ntpd}, the Network Time Protocol (NTP)\n" "daemon, as implemented by @uref{http://www.openntpd.org, OpenNTPD}. The\n" "daemon will keep the system clock synchronized with that of the given servers." msgstr "" -#: gnu/services/networking.scm:1032 +#: gnu/services/networking.scm:1027 msgid "" "Start @command{inetd}, the @dfn{Internet superserver}. It is responsible\n" "for listening on Internet sockets and spawning the corresponding services on\n" "demand." msgstr "" -#: gnu/services/networking.scm:1154 +#: gnu/services/networking.scm:1149 msgid "" "Run the OpenDHT @command{dhtnode} command that allows\n" "participating in the distributed hash table based OpenDHT network. The\n" @@ -1012,25 +1012,25 @@ msgid "" "applications in communication. It is used by Jami, for example." msgstr "" -#: gnu/services/networking.scm:1394 +#: gnu/services/networking.scm:1389 msgid "" "Run the @uref{https://torproject.org, Tor} anonymous\n" "networking daemon." msgstr "" -#: gnu/services/networking.scm:1443 +#: gnu/services/networking.scm:1438 #, fuzzy, scheme-format msgid "the 'iwd?' field is deprecated, please use 'shepherd-requirement' field instead~%" msgstr "~a: varning: ”~a” är föråldrat~@[, använd ”~a” istället~]~%" -#: gnu/services/networking.scm:1614 +#: gnu/services/networking.scm:1606 msgid "" "Run @uref{https://wiki.gnome.org/Projects/NetworkManager,\n" "NetworkManager}, a network management daemon that aims to simplify wired and\n" "wireless networking." msgstr "" -#: gnu/services/networking.scm:1937 +#: gnu/services/networking.scm:1929 #, fuzzy #| msgid "Connman network connection manager" msgid "" @@ -1038,14 +1038,14 @@ msgid "" "a network connection manager." msgstr "Nätverksanslutningshanteraren Connman" -#: gnu/services/networking.scm:1959 +#: gnu/services/networking.scm:1951 msgid "" "Run @uref{https://wiki.gnome.org/Projects/ModemManager,\n" "ModemManager}, a modem management daemon that aims to simplify dialup\n" "networking." msgstr "" -#: gnu/services/networking.scm:2050 +#: gnu/services/networking.scm:2042 msgid "" "Run @uref{http://www.draisberghof.de/usb_modeswitch/,\n" "USB_ModeSwitch}, a mode switching tool for controlling USB devices with\n" @@ -1056,18 +1056,18 @@ msgid "" "whatever the thing is supposed to do)." msgstr "" -#: gnu/services/networking.scm:2067 +#: gnu/services/networking.scm:2059 #, fuzzy, scheme-format msgid "the 'requirement' field is deprecated, please use 'shepherd-requirement' field instead~%" msgstr "~a: varning: ”~a” är föråldrat~@[, använd ”~a” istället~]~%" -#: gnu/services/networking.scm:2134 +#: gnu/services/networking.scm:2126 msgid "" "Run the WPA Supplicant daemon, a service that\n" "implements authentication, key negotiation and more for wireless networks." msgstr "" -#: gnu/services/networking.scm:2366 +#: gnu/services/networking.scm:2358 #, fuzzy #| msgid "Connman network connection manager" msgid "" @@ -1075,50 +1075,50 @@ msgid "" "@url{https://iwd.wiki.kernel.org/,iwd}, a network connection manager." msgstr "Nätverksanslutningshanteraren Connman" -#: gnu/services/networking.scm:2427 +#: gnu/services/networking.scm:2419 msgid "" "Run the @uref{https://w1.fi/hostapd/, hostapd} daemon for Wi-Fi access\n" "points and authentication servers." msgstr "" -#: gnu/services/networking.scm:2461 +#: gnu/services/networking.scm:2453 msgid "Run hostapd to simulate WiFi connectivity." msgstr "" -#: gnu/services/networking.scm:2519 +#: gnu/services/networking.scm:2511 msgid "" "Run @uref{http://www.openvswitch.org, Open vSwitch}, a multilayer virtual\n" "switch designed to enable massive network automation through programmatic\n" "extension." msgstr "" -#: gnu/services/networking.scm:2566 +#: gnu/services/networking.scm:2558 msgid "Run @command{iptables-restore}, setting up the specified rules." msgstr "" -#: gnu/services/networking.scm:2658 +#: gnu/services/networking.scm:2650 msgid "Run @command{nft}, setting up the specified ruleset." msgstr "" -#: gnu/services/networking.scm:2765 +#: gnu/services/networking.scm:2757 msgid "" "Run @url{https://pagekite.net/,PageKite}, a tunneling solution to make\n" "local servers publicly accessible on the web, even behind NATs and firewalls." msgstr "" -#: gnu/services/networking.scm:2861 +#: gnu/services/networking.scm:2853 msgid "" "Connect to the Yggdrasil mesh network.\n" "See @command{yggdrasil -genconf} for config options." msgstr "" -#: gnu/services/networking.scm:2997 +#: gnu/services/networking.scm:2989 msgid "" "Run @command{ipfs daemon}, the reference implementation\n" "of the IPFS peer-to-peer storage network." msgstr "" -#: gnu/services/networking.scm:3037 +#: gnu/services/networking.scm:3027 msgid "" "Run @uref{https://www.keepalived.org/, Keepalived}\n" "routing software." @@ -1160,9 +1160,9 @@ msgstr "profil ”~a” existerar inte~%" msgid "fail2ban: '~a' is not a supported log encoding~%" msgstr "profil ”~a” existerar inte~%" -#: gnu/services/security.scm:393 +#: gnu/services/security.scm:389 msgid "Run the fail2ban server." -msgstr "Kör servern för fail2ban." +msgstr "" #: gnu/services/shepherd.scm:167 msgid "" @@ -1255,11 +1255,11 @@ msgstr "" #: gnu/services/sound.scm:248 msgid "Configure PulseAudio sound support." -msgstr "Konfigurera ljudstöd för PulseAudio." +msgstr "" #: gnu/services/sound.scm:276 msgid "Configure LADSPA plugins." -msgstr "Konfigurera insticksprogram för LADSPA." +msgstr "" #: gnu/services/sound.scm:358 msgid "" @@ -1294,7 +1294,7 @@ msgstr "" #: gnu/services/ssh.scm:980 msgid "Run the webssh." -msgstr "Kör webssh." +msgstr "" #: gnu/services/telephony.scm:728 msgid "" @@ -1459,13 +1459,11 @@ msgid "" "Comparing ~a and\n" "~10t~a..." msgstr "" -"Jämför ~a och\n" -"~10t~a..." #: gnu/home/services.scm:685 #, scheme-format msgid " done (~a)\n" -msgstr " färdig (~a)\n" +msgstr "" #. TRANSLATORS: 'on-change' is the name of a service type, it #. probably shouldn't be translated. @@ -1598,7 +1596,7 @@ msgstr "" #: gnu/home/services/shells.scm:305 msgid "Install and configure Zsh." -msgstr "Installera och konfigurera Zsh." +msgstr "" #: gnu/home/services/shells.scm:498 msgid "Install and configure GNU Bash." @@ -1618,7 +1616,7 @@ msgstr "" #: gnu/home/services/sound.scm:132 msgid "Start essential PipeWire services." -msgstr "Starta essentiella PipeWire-tjänster." +msgstr "" #: gnu/home/services/sound.scm:219 msgid "" @@ -1713,13 +1711,11 @@ msgid "" "Cleanup finished.\n" "\n" msgstr "" -"Upprensningen slutfördes.\n" -"\n" #: gnu/home/services/symlink-manager.scm:200 #, scheme-format msgid "Symlinking ~a -> ~a..." -msgstr "Symlänkar ~a-> ~a..." +msgstr "" #: gnu/home/services/symlink-manager.scm:217 #, fuzzy, scheme-format @@ -1733,9 +1729,6 @@ msgid "" "Finished updating symlinks.\n" "\n" msgstr "" -" klar\n" -"Uppdateringen av symlänkar klart.\n" -"\n" #: gnu/home/services/symlink-manager.scm:253 msgid "" @@ -1780,11 +1773,11 @@ msgid_plural "invalid file system mount flags:~{ ~s~}~%" msgstr[0] "ogiltig filsystems monteringsflagga:~{~s~}~%" msgstr[1] "ogiltiga filsystems monteringsflaggor:~{~s~}~%" -#: gnu/system/file-systems.scm:670 +#: gnu/system/file-systems.scm:669 msgid "The store is on a Btrfs subvolume, but the subvolume name is unknown." msgstr "Föråddet är på en Btrfs subvolym, men subvolymens namn är okänd." -#: gnu/system/file-systems.scm:674 +#: gnu/system/file-systems.scm:673 msgid "Use the @code{subvol} Btrfs file system option." msgstr "Använd Btrfs filsystem @code{subvol} flaggan." @@ -1853,7 +1846,7 @@ msgstr "" #: guix/scripts/git/authenticate.scm:282 guix/scripts/hash.scm:94 #: guix/scripts/pull.scm:131 guix/scripts/substitute.scm:256 #: guix/scripts/system.scm:1084 guix/scripts/system/installer.scm:52 -#: guix/scripts/lint.scm:117 guix/scripts/publish.scm:114 +#: guix/scripts/lint.scm:117 guix/scripts/publish.scm:115 #: guix/scripts/edit.scm:53 guix/scripts/size.scm:246 #: guix/scripts/graph.scm:537 guix/scripts/challenge.scm:460 #: guix/scripts/copy.scm:127 guix/scripts/pack.scm:1679 @@ -1861,8 +1854,8 @@ msgstr "" #: guix/scripts/processes.scm:301 guix/scripts/deploy.scm:58 #: guix/scripts/container.scm:35 guix/scripts/container/exec.scm:43 #: guix/scripts/archive.scm:104 guix/scripts/shell.scm:87 -#: guix/scripts/environment.scm:165 guix/scripts/style.scm:645 -#: guix/scripts/home.scm:159 guix/scripts/time-machine.scm:79 +#: guix/scripts/environment.scm:164 guix/scripts/style.scm:645 +#: guix/scripts/home.scm:157 guix/scripts/time-machine.scm:79 #: guix/scripts/import.scm:81 guix/scripts/import/cpan.scm:44 #: guix/scripts/import/cran.scm:49 guix/scripts/import/crate.scm:59 #: guix/scripts/import/egg.scm:45 guix/scripts/import/gem.scm:50 @@ -2094,7 +2087,7 @@ msgstr "Konfigurationsfil" #: gnu/installer.scm:366 #, scheme-format msgid "cannot determine installer provenance~%" -msgstr "kan inte avgöra installationsprogrammets ursprung ~%" +msgstr "" #: gnu/installer/connman.scm:196 msgid "Could not determine the state of connman." @@ -2156,7 +2149,7 @@ msgstr "" #: gnu/installer/newt.scm:89 msgid "Dump archive created" -msgstr "Ett dump-arkiv skapades" +msgstr "" #: gnu/installer/newt.scm:93 #, scheme-format @@ -2189,7 +2182,7 @@ msgstr "" #: gnu/installer/newt.scm:141 msgid "External command error" -msgstr "Externt kommando-fel" +msgstr "" #: gnu/installer/newt/ethernet.scm:65 msgid "No ethernet service available, please try again." @@ -2736,7 +2729,7 @@ msgstr "Du kan nu välja andra nätverkstjänster som ska köra på ditt system. #: gnu/installer/newt/services.scm:79 msgid "Printing and document services" -msgstr "Utskrift och dokumentationstjänster" +msgstr "" #: gnu/installer/newt/services.scm:96 #, fuzzy @@ -2809,7 +2802,7 @@ msgstr "" #: gnu/installer/newt/user.scm:129 msgid "Root account" -msgstr "Root-konto" +msgstr "" #: gnu/installer/newt/user.scm:171 msgid "Please confirm the password." @@ -2855,7 +2848,7 @@ msgstr "" #: gnu/installer/newt/welcome.scm:136 msgid "Pre-install warning" -msgstr "Varning före installation" +msgstr "" #: gnu/installer/newt/welcome.scm:143 #, scheme-format @@ -2870,7 +2863,7 @@ msgstr "" #: gnu/installer/newt/welcome.scm:154 msgid "Hardware support warning" -msgstr "Varning för hårdvarustöd" +msgstr "" #: gnu/installer/newt/welcome.scm:163 #, fuzzy @@ -2986,7 +2979,7 @@ msgstr "Filsystemstyp: ~a" #: gnu/installer/parted.scm:654 #, scheme-format msgid "Bootable flag: ~:[off~;on~]" -msgstr "Bootbar flagga: ~:[av~;på~]" +msgstr "" #: gnu/installer/parted.scm:658 #, scheme-format @@ -3067,7 +3060,7 @@ msgstr "Nätverkstjänst" #: gnu/installer/services.scm:163 msgid ";; Fill-in your IP.\n" -msgstr ";; Fyll i din IP.\n" +msgstr "" #: gnu/installer/services.scm:168 msgid ";; Fill-in your gateway IP.\n" @@ -3153,11 +3146,11 @@ msgstr "" #: gnu/installer/utils.scm:220 #, scheme-format msgid "Command ~s succeeded" -msgstr "Kommandot ~s lyckades" +msgstr "" #: gnu/installer/utils.scm:235 msgid "%run-command-in-installer not set" -msgstr "%run-command-in-installer har inte ställts in" +msgstr "" #: gnu/machine/hetzner.scm:163 gnu/machine/ssh.scm:504 #, scheme-format @@ -3337,7 +3330,7 @@ msgstr "" #: gnu/packages/bootstrap.scm:599 msgid "Bootstrap Guile" -msgstr "Bootstrapa Guile" +msgstr "" #: gnu/packages/bootstrap.scm:600 msgid "Pre-built Guile for bootstrapping purposes." @@ -3358,15 +3351,15 @@ msgstr "”~a~{ ~a~}” avslutades med status ~a; utmatning följer:~%~%~{ ~a~% #: guix/scripts.scm:88 msgid "main commands" -msgstr "huvudsakliga kommandon" +msgstr "" #: guix/scripts.scm:89 msgid "software development commands" -msgstr "kommandon för utveckling av programvara" +msgstr "" #: guix/scripts.scm:90 msgid "packaging commands" -msgstr "paketeringskommandon" +msgstr "" #: guix/scripts.scm:91 msgid "plumbing commands" @@ -3374,11 +3367,11 @@ msgstr "" #: guix/scripts.scm:92 msgid "internal commands" -msgstr "interna kommandon" +msgstr "" #: guix/scripts.scm:93 msgid "extension commands" -msgstr "förlängda kommandon" +msgstr "" #: guix/scripts.scm:138 #, scheme-format @@ -3622,11 +3615,11 @@ msgstr "inte ett tal: ”~a”-flaggargument: ~a~%" #: guix/scripts/build.scm:343 msgid "The available systems are:\n" -msgstr "De tillgängliga systemen är:\n" +msgstr "" #: guix/scripts/build.scm:357 msgid "The available targets are:\n" -msgstr "De tillgängliga målen är:\n" +msgstr "" #: guix/scripts/build.scm:378 #, fuzzy, scheme-format @@ -3773,7 +3766,7 @@ msgstr "" " --repair reparera angivna objekt" #: guix/scripts/build.scm:461 guix/scripts/pack.scm:1669 -#: guix/scripts/environment.scm:106 +#: guix/scripts/environment.scm:105 msgid "" "\n" " -r, --root=FILE make FILE a symlink to the result, and register it\n" @@ -3788,8 +3781,8 @@ msgstr "" #: guix/scripts/upgrade.scm:39 guix/scripts/pull.scm:122 #: guix/scripts/system.scm:1066 guix/scripts/copy.scm:122 #: guix/scripts/pack.scm:1674 guix/scripts/deploy.scm:71 -#: guix/scripts/archive.scm:93 guix/scripts/environment.scm:137 -#: guix/scripts/home.scm:148 +#: guix/scripts/archive.scm:93 guix/scripts/environment.scm:136 +#: guix/scripts/home.scm:146 msgid "" "\n" " -v, --verbosity=LEVEL use the given verbosity LEVEL" @@ -3821,15 +3814,15 @@ msgstr "" #: guix/scripts/hash.scm:96 guix/scripts/pull.scm:133 #: guix/scripts/substitute.scm:258 guix/scripts/system.scm:1086 #: guix/scripts/system/installer.scm:54 guix/scripts/lint.scm:121 -#: guix/scripts/publish.scm:116 guix/scripts/edit.scm:55 +#: guix/scripts/publish.scm:117 guix/scripts/edit.scm:55 #: guix/scripts/size.scm:248 guix/scripts/graph.scm:539 #: guix/scripts/challenge.scm:462 guix/scripts/copy.scm:129 #: guix/scripts/pack.scm:1681 guix/scripts/weather.scm:386 #: guix/scripts/describe.scm:99 guix/scripts/processes.scm:303 #: guix/scripts/deploy.scm:60 guix/scripts/container.scm:37 #: guix/scripts/container/exec.scm:45 guix/scripts/archive.scm:106 -#: guix/scripts/shell.scm:89 guix/scripts/environment.scm:167 -#: guix/scripts/style.scm:647 guix/scripts/home.scm:161 +#: guix/scripts/shell.scm:89 guix/scripts/environment.scm:166 +#: guix/scripts/style.scm:647 guix/scripts/home.scm:159 #: guix/scripts/time-machine.scm:81 guix/scripts/import.scm:85 #: guix/scripts/import/cpan.scm:48 guix/scripts/import/cran.scm:58 #: guix/scripts/import/crate.scm:61 guix/scripts/import/egg.scm:49 @@ -3977,13 +3970,17 @@ msgstr "guix: ~a: kommando hittades inte~%" msgid "could not find available substitutes at ~a~%" msgstr "" -#: guix/cve.scm:185 +#: guix/cve.scm:202 +msgid "invalid CVE feed" +msgstr "" + +#: guix/cve.scm:204 #, fuzzy, scheme-format #| msgid "unsupported hash format: ~a~%" msgid "unsupported CVE format: '~a'" msgstr "hashformat stöds inte: ~a~%" -#: guix/cve.scm:191 +#: guix/cve.scm:207 #, fuzzy, scheme-format #| msgid "unsupported hash format: ~a~%" msgid "unsupported CVE data version: '~a'" @@ -4089,7 +4086,7 @@ msgstr "~A: okänt paket~%" #. and should not be translated. #: guix/lint.scm:209 msgid "incorrect call to ‘modify-phases’" -msgstr "felaktigt samtal till ‘modify-phases’" +msgstr "" #. TRANSLATORS: See ‘modify-phases’ in the manual. #: guix/lint.scm:237 @@ -4151,195 +4148,195 @@ msgstr "" #: guix/lint.scm:499 msgid "description contains leading whitespace" -msgstr "beskrivningen innehåller inledande blanksteg" +msgstr "" #: guix/lint.scm:508 msgid "description contains trailing whitespace" -msgstr "beskrivningen innehåller efterföljande blanksteg" +msgstr "" -#: guix/lint.scm:542 +#: guix/lint.scm:541 #, scheme-format msgid "invalid description: ~s" -msgstr "ogiltig beskrivning: ~s" +msgstr "" -#: guix/lint.scm:614 +#: guix/lint.scm:613 #, scheme-format msgid "'~a' should probably be a native input" msgstr "" -#: guix/lint.scm:629 +#: guix/lint.scm:628 #, scheme-format msgid "'~a' should probably not be an input at all" msgstr "" -#: guix/lint.scm:644 +#: guix/lint.scm:643 #, scheme-format msgid "'~a' should probably be switched for its minimal variant" msgstr "" -#: guix/lint.scm:655 +#: guix/lint.scm:654 #, scheme-format msgid "label '~a' does not match package name '~a'" msgstr "" -#: guix/lint.scm:685 +#: guix/lint.scm:684 #, scheme-format msgid "\"bash-minimal\" should be in 'inputs' when '~a' is used" msgstr "" -#: guix/lint.scm:736 +#: guix/lint.scm:735 msgid "no period allowed at the end of the synopsis" msgstr "" -#: guix/lint.scm:750 +#: guix/lint.scm:749 msgid "no article allowed at the beginning of the synopsis" msgstr "" -#: guix/lint.scm:759 +#: guix/lint.scm:758 msgid "synopsis should be less than 80 characters long" msgstr "" -#: guix/lint.scm:769 +#: guix/lint.scm:768 msgid "synopsis should start with an upper-case letter or digit" msgstr "" -#: guix/lint.scm:777 +#: guix/lint.scm:776 msgid "synopsis should not start with the package name" msgstr "" -#: guix/lint.scm:791 +#: guix/lint.scm:790 msgid "Texinfo markup in synopsis is invalid" msgstr "" -#: guix/lint.scm:799 +#: guix/lint.scm:798 msgid "synopsis contains trailing whitespace" -msgstr "sammanfattningen innehåller efterföljande mellanslag" +msgstr "" -#: guix/lint.scm:816 +#: guix/lint.scm:815 msgid "synopsis should not be empty" msgstr "" -#: guix/lint.scm:826 +#: guix/lint.scm:825 #, scheme-format msgid "invalid synopsis: ~s" msgstr "" -#: guix/lint.scm:932 +#: guix/lint.scm:931 #, scheme-format msgid "~a: HTTP GET error for ~a: ~a (~s)~%" msgstr "" -#: guix/lint.scm:942 +#: guix/lint.scm:941 #, scheme-format msgid "~a: host lookup failure: ~a~%" msgstr "" -#: guix/lint.scm:947 +#: guix/lint.scm:946 #, scheme-format msgid "~a: TLS certificate error: ~a" msgstr "" -#: guix/lint.scm:952 +#: guix/lint.scm:951 #, scheme-format msgid "~a: TLS error in '~a': ~a~%" msgstr "" -#: guix/lint.scm:963 guix/ui.scm:918 guix/scripts/offload.scm:194 +#: guix/lint.scm:962 guix/ui.scm:918 guix/scripts/offload.scm:194 #, scheme-format msgid "~a: ~a~%" msgstr "~a: ~a~%" -#: guix/lint.scm:994 +#: guix/lint.scm:993 #, scheme-format msgid "URI ~a returned suspiciously small file (~a bytes)" msgstr "" -#: guix/lint.scm:1003 +#: guix/lint.scm:1002 #, scheme-format msgid "permanent redirect from ~a to ~a" msgstr "" -#: guix/lint.scm:1009 +#: guix/lint.scm:1008 #, scheme-format msgid "invalid permanent redirect from ~a" msgstr "" -#: guix/lint.scm:1015 guix/lint.scm:1025 +#: guix/lint.scm:1014 guix/lint.scm:1024 #, scheme-format msgid "URI ~a not reachable: ~a (~s)" msgstr "" -#: guix/lint.scm:1031 +#: guix/lint.scm:1030 #, scheme-format msgid "URI ~a domain not found: ~a" msgstr "" -#: guix/lint.scm:1037 +#: guix/lint.scm:1036 #, scheme-format msgid "URI ~a unreachable: ~a" -msgstr "URI ~a kunde inte nås: ~a" +msgstr "" -#: guix/lint.scm:1045 +#: guix/lint.scm:1044 #, scheme-format msgid "TLS certificate error: ~a" -msgstr "Fel på TLS-certifikatet: ~a" +msgstr "" -#: guix/lint.scm:1072 +#: guix/lint.scm:1071 msgid "invalid value for home page" msgstr "" -#: guix/lint.scm:1077 +#: guix/lint.scm:1076 #, scheme-format msgid "invalid home page URL: ~s" msgstr "" -#: guix/lint.scm:1114 +#: guix/lint.scm:1113 msgid "file names of patches should start with the package name" msgstr "" -#: guix/lint.scm:1134 +#: guix/lint.scm:1133 #, scheme-format msgid "~a: file name is too long, which may break 'make dist'" msgstr "" -#: guix/lint.scm:1155 +#: guix/lint.scm:1154 #, scheme-format msgid "~a: empty patch" -msgstr "~a: tom patch" +msgstr "" -#: guix/lint.scm:1164 +#: guix/lint.scm:1163 #, scheme-format msgid "~a: patch lacks comment and upstream status" msgstr "" -#: guix/lint.scm:1225 +#: guix/lint.scm:1224 #, scheme-format msgid "proposed synopsis: ~s~%" -msgstr "föreslagen sammanfattning: ~s~%" +msgstr "" -#: guix/lint.scm:1239 +#: guix/lint.scm:1238 #, scheme-format msgid "proposed description:~% \"~a\"~%" -msgstr "föreslagen beskrivning:~% \"~a\"~%" +msgstr "" -#: guix/lint.scm:1324 +#: guix/lint.scm:1323 msgid "all the source URIs are unreachable:" msgstr "" -#: guix/lint.scm:1359 +#: guix/lint.scm:1358 msgid "the source file name should contain the package name" msgstr "" -#: guix/lint.scm:1371 +#: guix/lint.scm:1370 msgid "the source URI should not be an autogenerated tarball" msgstr "" -#: guix/lint.scm:1389 guix/lint.scm:1434 +#: guix/lint.scm:1388 guix/lint.scm:1433 #, scheme-format msgid "URL should be '~a'" -msgstr "URL bör vara '~a'" +msgstr "" -#: guix/lint.scm:1427 +#: guix/lint.scm:1426 #, fuzzy, scheme-format msgid "while accessing '~a'" msgstr "misslyckades med att läsa in ”~a”: ~a~%" @@ -4347,259 +4344,259 @@ msgstr "misslyckades med att läsa in ”~a”: ~a~%" #. TRANSLATORS: check and #:tests? are a #. Scheme symbol and keyword respectively #. and should not be translated. -#: guix/lint.scm:1462 +#: guix/lint.scm:1461 msgid "the 'check' phase should respect #:tests?" msgstr "" -#: guix/lint.scm:1484 guix/lint.scm:1495 guix/lint.scm:1503 guix/lint.scm:1507 +#: guix/lint.scm:1483 guix/lint.scm:1494 guix/lint.scm:1502 guix/lint.scm:1506 #, scheme-format msgid "failed to create ~a derivation: ~a" msgstr "" -#: guix/lint.scm:1489 +#: guix/lint.scm:1488 #, scheme-format msgid "failed to create ~a derivation: ~s" msgstr "" -#: guix/lint.scm:1545 +#: guix/lint.scm:1544 #, scheme-format msgid "propagated inputs ~a and ~a collide" msgstr "" -#: guix/lint.scm:1569 +#: guix/lint.scm:1568 msgid "invalid license field" -msgstr "ogiltigt licensfält" +msgstr "" -#: guix/lint.scm:1576 +#: guix/lint.scm:1575 msgid "while retrieving CVE vulnerabilities" -msgstr "vid inhämtning av CVE-sårbarheter" +msgstr "" -#: guix/lint.scm:1579 +#: guix/lint.scm:1578 #, fuzzy, scheme-format #| msgid "failed to retrieve list of packages from ~a: ~a (~a)~%" msgid "failed to get list of CVE vulnerabilities from '~a': ~a (~a)~%" msgstr "lyckades inte hämta en lista av paket från ~a: ~a (~a)~%" -#: guix/lint.scm:1636 +#: guix/lint.scm:1635 #, scheme-format msgid "probably vulnerable to ~a" -msgstr "förmodligen sårbar för ~a" +msgstr "" -#: guix/lint.scm:1655 +#: guix/lint.scm:1654 #, scheme-format msgid "'~a' should be set with the '~a' flag" msgstr "" -#: guix/lint.scm:1701 +#: guix/lint.scm:1700 #, fuzzy, scheme-format msgid "no updater for ~a" msgstr "ingen bygglogg för ”~a”~%" -#: guix/lint.scm:1706 guix/lint.scm:1928 +#: guix/lint.scm:1705 guix/lint.scm:1927 #, scheme-format msgid "while retrieving upstream info for '~a'" msgstr "" -#: guix/lint.scm:1715 +#: guix/lint.scm:1714 #, scheme-format msgid "can be upgraded to ~a" msgstr "" -#: guix/lint.scm:1721 +#: guix/lint.scm:1720 #, scheme-format msgid "updater '~a' failed to find upstream releases" msgstr "" -#: guix/lint.scm:1748 +#: guix/lint.scm:1747 #, fuzzy, scheme-format msgid "failed to access Disarchive database at ~a" msgstr "misslyckades med att läsa in ”~a”: ~a~%" -#: guix/lint.scm:1769 +#: guix/lint.scm:1768 msgid "Software Heritage rate limit reached; try again later" msgstr "" -#: guix/lint.scm:1773 +#: guix/lint.scm:1772 #, scheme-format msgid "'~a' returned ~a" -msgstr "'~a' gav som svar ~a" +msgstr "" #. TRANSLATORS: "Software Heritage" is a proper noun that #. must remain untranslated. See #. . -#: guix/lint.scm:1808 +#: guix/lint.scm:1807 msgid "scheduled Software Heritage archival" msgstr "" -#: guix/lint.scm:1814 +#: guix/lint.scm:1813 msgid "archival rate limit exceeded; try again later" msgstr "" -#: guix/lint.scm:1824 +#: guix/lint.scm:1823 msgid "source code cannot be archived" msgstr "" -#: guix/lint.scm:1887 +#: guix/lint.scm:1886 msgid "source not archived on Software Heritage and missing from the Disarchive database" msgstr "" -#: guix/lint.scm:1897 +#: guix/lint.scm:1896 #, scheme-format msgid "Disarchive entry refers to non-existent SWH directory '~a'" msgstr "" -#: guix/lint.scm:1910 +#: guix/lint.scm:1909 msgid "source is not an origin, it cannot be archived" msgstr "" -#: guix/lint.scm:1920 +#: guix/lint.scm:1919 msgid "while connecting to Software Heritage" msgstr "" -#: guix/lint.scm:1937 +#: guix/lint.scm:1936 #, scheme-format msgid "ahead of Stackage LTS version ~a" msgstr "" -#: guix/lint.scm:1954 +#: guix/lint.scm:1953 #, scheme-format msgid "tabulation on line ~a, column ~a" msgstr "" -#: guix/lint.scm:1966 +#: guix/lint.scm:1965 #, scheme-format msgid "trailing white space on line ~a" msgstr "" -#: guix/lint.scm:1980 +#: guix/lint.scm:1979 #, scheme-format msgid "line ~a is way too long (~a characters)" msgstr "" -#: guix/lint.scm:1994 +#: guix/lint.scm:1993 msgid "parentheses feel lonely, move to the previous or next line" msgstr "" -#: guix/lint.scm:2072 +#: guix/lint.scm:2071 #, fuzzy msgid "source file not found" msgstr "modul ~a hittades inte" -#: guix/lint.scm:2084 +#: guix/lint.scm:2083 msgid "Validate package names" msgstr "" -#: guix/lint.scm:2088 +#: guix/lint.scm:2087 msgid "Check if tests are explicitly enabled" msgstr "" -#: guix/lint.scm:2092 +#: guix/lint.scm:2091 msgid "Check that cross-compilers are used when cross-compiling" msgstr "" -#: guix/lint.scm:2096 +#: guix/lint.scm:2095 msgid "Validate package descriptions" -msgstr "Validera paketbeskrivningar" +msgstr "" -#: guix/lint.scm:2100 +#: guix/lint.scm:2099 msgid "Identify inputs that should be native inputs" msgstr "" -#: guix/lint.scm:2104 +#: guix/lint.scm:2103 msgid "Identify inputs that shouldn't be inputs at all" msgstr "" -#: guix/lint.scm:2108 +#: guix/lint.scm:2107 msgid "Identify inputs that should use their minimal variant" msgstr "" -#: guix/lint.scm:2112 +#: guix/lint.scm:2111 msgid "Identify input labels that do not match package names" msgstr "" -#: guix/lint.scm:2116 +#: guix/lint.scm:2115 msgid "Make sure 'wrap-program' can find its interpreter." msgstr "" #. TRANSLATORS: is the name of a data type and must not be #. translated. -#: guix/lint.scm:2122 +#: guix/lint.scm:2121 msgid "Make sure the 'license' field is a or a list thereof" msgstr "" -#: guix/lint.scm:2127 +#: guix/lint.scm:2126 msgid "Make sure tests are only run when requested" msgstr "" -#: guix/lint.scm:2131 +#: guix/lint.scm:2130 msgid "Suggest 'mirror://' URLs" -msgstr "Föreslå 'mirror://'-URL:er" +msgstr "" -#: guix/lint.scm:2135 +#: guix/lint.scm:2134 msgid "Validate file names of sources" msgstr "" -#: guix/lint.scm:2139 +#: guix/lint.scm:2138 msgid "Check for autogenerated tarballs" -msgstr "Sök efter autogenererade tarball-arkiv" +msgstr "" -#: guix/lint.scm:2143 +#: guix/lint.scm:2142 msgid "Check for misplaced flags" msgstr "" -#: guix/lint.scm:2147 +#: guix/lint.scm:2146 msgid "Report failure to compile a package to a derivation" msgstr "" -#: guix/lint.scm:2152 +#: guix/lint.scm:2151 msgid "Report collisions that would occur due to propagated inputs" msgstr "" -#: guix/lint.scm:2157 +#: guix/lint.scm:2156 msgid "Validate file names and availability of patches" msgstr "" -#: guix/lint.scm:2161 +#: guix/lint.scm:2160 msgid "Validate patch headers" msgstr "" -#: guix/lint.scm:2165 +#: guix/lint.scm:2164 msgid "Look for formatting issues in the source" msgstr "" -#: guix/lint.scm:2172 +#: guix/lint.scm:2171 msgid "Validate package synopses" -msgstr "Validera sammanfattningarna för paketen" +msgstr "" -#: guix/lint.scm:2176 +#: guix/lint.scm:2175 msgid "Validate synopsis & description of GNU packages" msgstr "" -#: guix/lint.scm:2180 +#: guix/lint.scm:2179 msgid "Validate home-page URLs" msgstr "" -#: guix/lint.scm:2184 +#: guix/lint.scm:2183 msgid "Validate source URLs" -msgstr "Validera källans URL:er" +msgstr "" -#: guix/lint.scm:2188 +#: guix/lint.scm:2187 msgid "Suggest GitHub URLs" -msgstr "Föreslå GitHubens URL:er" +msgstr "" -#: guix/lint.scm:2192 +#: guix/lint.scm:2191 msgid "Check the Common Vulnerabilities and Exposures (CVE) database" msgstr "" -#: guix/lint.scm:2197 +#: guix/lint.scm:2196 msgid "Check the package for new upstream releases" msgstr "" -#: guix/lint.scm:2201 +#: guix/lint.scm:2200 msgid "Ensure source code archival on Software Heritage" msgstr "" -#: guix/lint.scm:2205 +#: guix/lint.scm:2204 msgid "Ensure Haskell packages use Stackage LTS versions" msgstr "" @@ -4723,7 +4720,7 @@ msgid "download a file to the store and print its hash" msgstr "" #: guix/scripts/download.scm:315 guix/scripts/package.scm:1073 -#: guix/scripts/pull.scm:843 guix/scripts/publish.scm:1244 +#: guix/scripts/pull.scm:843 guix/scripts/publish.scm:1248 #: guix/scripts/discover.scm:136 guix/scripts/time-machine.scm:142 #, scheme-format msgid "~A: extraneous argument~%" @@ -5081,7 +5078,7 @@ msgstr "" #: guix/scripts/remove.scm:67 msgid "remove installed packages" -msgstr "ta bort installerade paket" +msgstr "" #: guix/scripts/upgrade.scm:34 msgid "" @@ -5257,7 +5254,7 @@ msgstr "" #: guix/scripts/gc.scm:107 #, scheme-format msgid "~a: invalid '--verify' option~%" -msgstr "~a: ogiltigt alternativ för '--verify'~%" +msgstr "" #: guix/scripts/gc.scm:155 #, scheme-format @@ -5289,12 +5286,12 @@ msgstr "" msgid "freeing ~a~%" msgstr "tar bort ~a~%" -#: guix/scripts/gc.scm:306 +#: guix/scripts/gc.scm:307 #, scheme-format msgid "extraneous arguments: ~{~a ~}~%" msgstr "" -#: guix/scripts/gc.scm:332 guix/scripts/gc.scm:335 +#: guix/scripts/gc.scm:331 guix/scripts/gc.scm:334 #, fuzzy, scheme-format #| msgid "~a for ~a~%" msgid "freed ~a~%" @@ -5310,7 +5307,7 @@ msgstr "" "Kör KOMMANDO med ARGUMENT.\n" #: guix/scripts/git.scm:29 guix/scripts/system.scm:980 -#: guix/scripts/container.scm:30 guix/scripts/home.scm:102 +#: guix/scripts/container.scm:30 guix/scripts/home.scm:100 msgid "The valid values for ACTION are:\n" msgstr "" @@ -5610,7 +5607,7 @@ msgstr "Uppdaterar kanal ”~a” från ett Git-arkiv vid ”~a”…~%" #: guix/scripts/pull.scm:259 msgid "New in this revision:\n" -msgstr "Nytt i den här revisionen:\n" +msgstr "" #. TRANSLATORS: This describes a "channel"; the first placeholder is #. the channel name (e.g., "guix") and the second placeholder is its @@ -5623,12 +5620,12 @@ msgstr "~a: ~a~%" #: guix/scripts/pull.scm:307 #, scheme-format msgid " commit ~a~%" -msgstr " ändring ~a~%" +msgstr "" #: guix/scripts/pull.scm:345 #, scheme-format msgid "News for channel '~a'~%" -msgstr "Nyheter för kanalen '~a'~%" +msgstr "" #: guix/scripts/pull.scm:372 #, scheme-format @@ -5794,7 +5791,7 @@ msgstr "" #: guix/scripts/substitute.scm:525 #, scheme-format msgid "Downloading ~a...~%" -msgstr "Hämtar ~a...~%" +msgstr "" #: guix/scripts/substitute.scm:530 #, fuzzy, scheme-format @@ -5829,7 +5826,7 @@ msgstr "" #: guix/scripts/substitute.scm:832 #, scheme-format msgid "~a: invalid URI~%" -msgstr "~a: ogiltig URI~%" +msgstr "" #: guix/scripts/substitute.scm:841 msgid "implement the build daemon's substituter protocol" @@ -5838,7 +5835,7 @@ msgstr "" #: guix/scripts/substitute.scm:923 #, scheme-format msgid "~a: unrecognized options~%" -msgstr "~a: icke igenkänt alternativ~%" +msgstr "" #: guix/scripts/authenticate.scm:64 #, fuzzy, scheme-format @@ -5884,7 +5881,7 @@ msgstr "~A: främmande argument~%" #: guix/scripts/system.scm:188 #, scheme-format msgid "copying to '~a'..." -msgstr "kopierar till '~a'..." +msgstr "" #: guix/scripts/system.scm:224 #, scheme-format @@ -5924,7 +5921,7 @@ msgstr "" #: guix/scripts/system.scm:317 #, scheme-format msgid "something went wrong: ~s~%" -msgstr "något gick fel: ~s~%" +msgstr "" #: guix/scripts/system.scm:320 #, scheme-format @@ -5963,17 +5960,17 @@ msgstr "Paket hittades inte i opam-arkiv: ~a~%" #: guix/scripts/system.scm:499 guix/scripts/home.scm:805 #, scheme-format msgid " branch: ~a~%" -msgstr " gren: ~a~%" +msgstr "" #: guix/scripts/system.scm:500 guix/scripts/home.scm:806 #, scheme-format msgid " commit: ~a~%" -msgstr " ändring: ~a~%" +msgstr "" #: guix/scripts/system.scm:520 guix/scripts/home.scm:819 #, scheme-format msgid " file name: ~a~%" -msgstr " filnamn: ~a~%" +msgstr "" #: guix/scripts/system.scm:521 guix/scripts/home.scm:820 #, scheme-format @@ -5984,12 +5981,12 @@ msgstr "" #: guix/scripts/system.scm:523 #, scheme-format msgid " label: ~a~%" -msgstr " etikett: ~a~%" +msgstr "" #: guix/scripts/system.scm:524 #, scheme-format msgid " bootloader: ~a~%" -msgstr " uppstartsladdare: ~a~%" +msgstr "" #. TRANSLATORS: The '~[', '~;', and '~]' sequences in this string must #. be preserved. They denote conditionals, such that the result will @@ -6007,12 +6004,12 @@ msgstr "" #: guix/scripts/system.scm:540 #, scheme-format msgid " kernel: ~a~%" -msgstr " kärna: ~a~%" +msgstr "" #: guix/scripts/system.scm:545 #, scheme-format msgid " multiboot: ~a~%" -msgstr " multiboot: ~a~%" +msgstr "" #. TRANSLATORS: Here "channel" is the same terminology as used in #. "guix describe" and "guix pull --channels". @@ -6085,7 +6082,7 @@ msgstr "" #: guix/scripts/system.scm:892 #, scheme-format msgid "activating system...~%" -msgstr "aktiverar systemet...~%" +msgstr "" #: guix/scripts/system.scm:903 msgid "" @@ -6203,7 +6200,7 @@ msgid "" " instead of reading FILE, when applicable" msgstr "" -#: guix/scripts/system.scm:1023 guix/scripts/home.scm:135 +#: guix/scripts/system.scm:1023 guix/scripts/home.scm:133 msgid "" "\n" " --allow-downgrades for 'reconfigure', allow downgrades to earlier\n" @@ -6322,7 +6319,7 @@ msgid "" " --skip-checks skip file system and initrd module safety checks" msgstr "" -#: guix/scripts/system.scm:1069 guix/scripts/home.scm:150 +#: guix/scripts/system.scm:1069 guix/scripts/home.scm:148 msgid "" "\n" " --graph-backend=BACKEND\n" @@ -6379,11 +6376,11 @@ msgstr "" #: guix/scripts/system.scm:1291 guix/scripts/home.scm:539 #, scheme-format msgid "no configuration specified~%" -msgstr "ingen konfiguration angavs~%" +msgstr "" #: guix/scripts/system.scm:1323 msgid "image lacks an operating-system" -msgstr "avbilden saknar ett operativsystem" +msgstr "" #: guix/scripts/system.scm:1409 guix/scripts/system.scm:1438 #: guix/scripts/system.scm:1445 guix/scripts/system.scm:1451 @@ -6393,7 +6390,7 @@ msgstr "avbilden saknar ett operativsystem" #: guix/scripts/offload.scm:851 guix/scripts/offload.scm:863 #, scheme-format msgid "wrong number of arguments~%" -msgstr "fel antal argument~%" +msgstr "" #: guix/scripts/system.scm:1421 #, fuzzy, scheme-format @@ -6407,7 +6404,7 @@ msgstr "" #: guix/scripts/system.scm:1472 guix/scripts/home.scm:667 #, scheme-format msgid "~a: unknown action~%" -msgstr "~a: okänd åtgärd~%" +msgstr "" #: guix/scripts/system.scm:1491 guix/scripts/home.scm:683 #, scheme-format @@ -6466,7 +6463,7 @@ msgstr "" #: guix/scripts/system/search.scm:107 guix/ui.scm:1677 guix/ui.scm:1695 msgid "unknown" -msgstr "okänt" +msgstr "" #: guix/scripts/system/reconfigure.scm:260 #, fuzzy, scheme-format @@ -6479,7 +6476,7 @@ msgstr "misslyckades med att läsa in ”~a”: ~a~%" msgid "aborting reconfiguration because commit ~a of channel '~a' is not a descendant of ~a" msgstr "" -#: guix/scripts/system/reconfigure.scm:384 guix/channels.scm:497 +#: guix/scripts/system/reconfigure.scm:384 guix/channels.scm:496 msgid "" "Use @option{--allow-downgrades} to force\n" "this downgrade." @@ -6564,19 +6561,19 @@ msgstr "profil ”~a” existerar inte~%" #: guix/scripts/locate.scm:256 #, scheme-format msgid "schema version:\t~a~%" -msgstr "schema-version: ~a~%" +msgstr "" #: guix/scripts/locate.scm:258 msgid "number of packages:\t~9h~%" -msgstr "antalet paket: ~9h~%" +msgstr "" #: guix/scripts/locate.scm:260 msgid "number of files:\t~9h~%" -msgstr "antalet filer: ~9h~%" +msgstr "" #: guix/scripts/locate.scm:262 msgid "database size:\t~9h MiB~%" -msgstr "databasens storlek: ~9h MiB~%" +msgstr "" #: guix/scripts/locate.scm:389 #, fuzzy @@ -6703,32 +6700,32 @@ msgid_plural "files~{ '~a'~} not found in database '~a'~%" msgstr[0] "tjänst av typ ”~a” hittades inte" msgstr[1] "tjänst av typ ”~a” hittades inte" -#: guix/scripts/publish.scm:81 +#: guix/scripts/publish.scm:82 #, scheme-format msgid "" "Usage: guix publish [OPTION]...\n" "Publish ~a over HTTP.\n" msgstr "" -#: guix/scripts/publish.scm:83 +#: guix/scripts/publish.scm:84 msgid "" "\n" " -p, --port=PORT listen on PORT" msgstr "" -#: guix/scripts/publish.scm:85 +#: guix/scripts/publish.scm:86 msgid "" "\n" " --listen=HOST listen on the network interface for HOST" msgstr "" -#: guix/scripts/publish.scm:87 +#: guix/scripts/publish.scm:88 msgid "" "\n" " -u, --user=USER change privileges to USER as soon as possible" msgstr "" -#: guix/scripts/publish.scm:89 +#: guix/scripts/publish.scm:90 #, fuzzy msgid "" "\n" @@ -6737,123 +6734,123 @@ msgstr "" "\n" " -d, --derivations returnera härledningssökvägar för de givna paketen" -#: guix/scripts/publish.scm:91 +#: guix/scripts/publish.scm:92 msgid "" "\n" " -C, --compression[=METHOD:LEVEL]\n" " compress archives with METHOD at LEVEL" msgstr "" -#: guix/scripts/publish.scm:94 +#: guix/scripts/publish.scm:95 msgid "" "\n" " -c, --cache=DIRECTORY cache published items to DIRECTORY" msgstr "" -#: guix/scripts/publish.scm:96 +#: guix/scripts/publish.scm:97 msgid "" "\n" " --cache-bypass-threshold=SIZE\n" " serve store items below SIZE even when not cached" msgstr "" -#: guix/scripts/publish.scm:99 +#: guix/scripts/publish.scm:100 msgid "" "\n" " --workers=N use N workers to bake items" msgstr "" -#: guix/scripts/publish.scm:101 +#: guix/scripts/publish.scm:102 msgid "" "\n" " --ttl=TTL announce narinfos can be cached for TTL seconds" msgstr "" -#: guix/scripts/publish.scm:103 +#: guix/scripts/publish.scm:104 msgid "" "\n" " --negative-ttl=TTL announce missing narinfos can be cached for TTL seconds" msgstr "" -#: guix/scripts/publish.scm:105 +#: guix/scripts/publish.scm:106 msgid "" "\n" " --nar-path=PATH use PATH as the prefix for nar URLs" msgstr "" -#: guix/scripts/publish.scm:107 +#: guix/scripts/publish.scm:108 msgid "" "\n" " --public-key=FILE use FILE as the public key for signatures" msgstr "" -#: guix/scripts/publish.scm:109 +#: guix/scripts/publish.scm:110 msgid "" "\n" " --private-key=FILE use FILE as the private key for signatures" msgstr "" -#: guix/scripts/publish.scm:111 +#: guix/scripts/publish.scm:112 msgid "" "\n" " -r, --repl[=PORT] spawn REPL server on PORT" msgstr "" -#: guix/scripts/publish.scm:127 +#: guix/scripts/publish.scm:128 #, scheme-format msgid "lookup of host '~a' failed: ~a~%" msgstr "" -#: guix/scripts/publish.scm:184 +#: guix/scripts/publish.scm:185 #, scheme-format msgid "lookup of host '~a' returned nothing" msgstr "" -#: guix/scripts/publish.scm:207 +#: guix/scripts/publish.scm:208 #, fuzzy, scheme-format msgid "~a: unsupported compression type~%" msgstr "~a: sökvägstyp stöds inte~%" -#: guix/scripts/publish.scm:225 guix/scripts/publish.scm:232 +#: guix/scripts/publish.scm:226 guix/scripts/publish.scm:233 #, scheme-format msgid "~a: invalid duration~%" -msgstr "~a: ogiltig varaktighet~%" +msgstr "" -#: guix/scripts/publish.scm:1178 +#: guix/scripts/publish.scm:1182 #, fuzzy, scheme-format msgid "Advertising ~a~%." msgstr "tar bort ~a~%" -#: guix/scripts/publish.scm:1213 +#: guix/scripts/publish.scm:1217 #, scheme-format msgid "~a: unexpected number of startup file descriptors" msgstr "" -#: guix/scripts/publish.scm:1227 +#: guix/scripts/publish.scm:1231 #, scheme-format msgid "user '~a' not found: ~a~%" msgstr "" -#: guix/scripts/publish.scm:1237 +#: guix/scripts/publish.scm:1241 msgid "publish build results over HTTP" msgstr "" -#: guix/scripts/publish.scm:1290 +#: guix/scripts/publish.scm:1294 #, scheme-format msgid "server running as root; consider using the '--user' option!~%" msgstr "" -#: guix/scripts/publish.scm:1299 +#: guix/scripts/publish.scm:1303 #, scheme-format msgid "publishing (started via socket activation)~%" msgstr "" -#: guix/scripts/publish.scm:1300 +#: guix/scripts/publish.scm:1304 #, scheme-format msgid "publishing ~a on ~a, port ~d~%" msgstr "" -#: guix/scripts/publish.scm:1306 +#: guix/scripts/publish.scm:1310 #, scheme-format msgid "using '~a' compression method, level ~a~%" msgstr "" @@ -6885,7 +6882,7 @@ msgstr "" #: guix/scripts/size.scm:70 #, scheme-format -msgid "no local build or substitute available for '~a'~%" +msgid "no available substitute information for '~a'~%" msgstr "" #: guix/scripts/size.scm:92 @@ -6894,16 +6891,16 @@ msgstr "förråd föremål" #: guix/scripts/size.scm:92 msgid "total" -msgstr "total" +msgstr "" #: guix/scripts/size.scm:92 msgid "self" -msgstr "själv" +msgstr "" #: guix/scripts/size.scm:100 #, scheme-format msgid "total: ~,1f MiB~%" -msgstr "totalt:~,1f MiB~%" +msgstr "" #. TRANSLATORS: This is the title of a graph, meaning that the graph #. represents a profile of the store (the "store" being the place where @@ -6934,7 +6931,7 @@ msgstr "" #: guix/scripts/size.scm:272 #, scheme-format msgid "~a: invalid sorting key~%" -msgstr "~a: ogiltig sorteringsnyckel~%" +msgstr "" #: guix/scripts/size.scm:299 msgid "profile the on-disk size of packages" @@ -7005,7 +7002,7 @@ msgstr "" #: guix/scripts/graph.scm:421 #, scheme-format msgid "~a: unknown node type~%" -msgstr "~a: okänd nod-typ~%" +msgstr "" #: guix/scripts/graph.scm:425 msgid "The available node types are:\n" @@ -7097,7 +7094,7 @@ msgstr "misslyckades med att läsa in ”~a”: ~a~%" #: guix/scripts/challenge.scm:406 #, scheme-format msgid " local hash: ~a~%" -msgstr " lokal hash-summa: ~a~%" +msgstr "" #: guix/scripts/challenge.scm:407 #, scheme-format @@ -7107,12 +7104,12 @@ msgstr "" #: guix/scripts/challenge.scm:409 #, scheme-format msgid " ~50a: ~a~%" -msgstr " ~50a: ~a~%" +msgstr "" #: guix/scripts/challenge.scm:417 #, scheme-format msgid "~a contents differ:~%" -msgstr "~a innehållen skiljer:~%" +msgstr "" #: guix/scripts/challenge.scm:421 #, scheme-format @@ -7127,7 +7124,7 @@ msgstr "" #: guix/scripts/challenge.scm:426 #, scheme-format msgid "~a contents match:~%" -msgstr "~a innehållen matchar:~%" +msgstr "" #: guix/scripts/challenge.scm:435 msgid "~h store items were analyzed:~%" @@ -7187,7 +7184,7 @@ msgstr "" #: guix/scripts/copy.scm:63 #, scheme-format msgid "~a: invalid SSH specification~%" -msgstr "~a: ogiltig SSH-specifikation~%" +msgstr "" #: guix/scripts/copy.scm:67 #, scheme-format @@ -7219,7 +7216,7 @@ msgstr "" #: guix/scripts/copy.scm:199 #, scheme-format msgid "use '--to' or '--from'~%" -msgstr "använd '--to' eller '--from'~%" +msgstr "" #: guix/scripts/pack.scm:198 #, scheme-format @@ -7560,7 +7557,7 @@ msgstr "profil ”~a” existerar inte~%" #: guix/scripts/pack.scm:1844 #, scheme-format msgid "~a: unknown pack format~%" -msgstr "~a: okänt paket-format~%" +msgstr "" #: guix/scripts/pack.scm:1871 #, scheme-format @@ -7670,12 +7667,12 @@ msgstr "" #: guix/scripts/weather.scm:316 msgid " ~h queued builds~%" -msgstr " ~h köade byggnationer~%" +msgstr "" #: guix/scripts/weather.scm:319 #, scheme-format msgid " ~a: ~a (~0,1f%)~%" -msgstr " ~a: ~a (~0,1f%)~%" +msgstr "" #: guix/scripts/weather.scm:325 #, scheme-format @@ -7694,7 +7691,7 @@ msgstr "" #: guix/scripts/weather.scm:352 msgid "unknown system" -msgstr "okänt system" +msgstr "" #: guix/scripts/weather.scm:367 msgid "" @@ -7745,7 +7742,7 @@ msgstr "" #: guix/scripts/weather.scm:407 #, scheme-format msgid "~a: invalid URL~%" -msgstr "~a: ogiltig URL~%" +msgstr "" #: guix/scripts/weather.scm:541 #, scheme-format @@ -7806,7 +7803,7 @@ msgstr "" #: guix/scripts/describe.scm:113 #, scheme-format msgid "~%;; warning: GUIX_PACKAGE_PATH=\"~a\"~%" -msgstr "~%;; varning: GUIX_PACKAGE_PATH=\"~a\"~%" +msgstr "" #: guix/scripts/describe.scm:116 #, scheme-format @@ -7829,37 +7826,37 @@ msgstr "" #: guix/scripts/describe.scm:165 #, scheme-format msgid "Git checkout:~%" -msgstr "Incheckning med Git:~%" +msgstr "" #: guix/scripts/describe.scm:166 #, scheme-format msgid " repository: ~a~%" -msgstr " filförråd: ~a~%" +msgstr "" #: guix/scripts/describe.scm:167 #, scheme-format msgid " branch: ~a~%" -msgstr " gren: ~a~%" +msgstr "" #: guix/scripts/describe.scm:168 #, scheme-format msgid " commit: ~a~%" -msgstr " ändring: ~a~%" +msgstr "" #: guix/scripts/describe.scm:230 #, scheme-format msgid " repository URL: ~a~%" -msgstr " URL för filförråd: ~a~%" +msgstr "" #: guix/scripts/describe.scm:233 #, scheme-format msgid " branch: ~a~%" -msgstr " gren: ~a~%" +msgstr "" #: guix/scripts/describe.scm:235 #, scheme-format msgid " commit: ~a~%" -msgstr " ändring: ~a~%" +msgstr "" #: guix/scripts/describe.scm:285 msgid "describe the channel revisions currently used" @@ -7962,7 +7959,7 @@ msgstr "misslyckades med att läsa in ”~a”: ~a~%" #: guix/scripts/deploy.scm:187 guix/scripts/deploy.scm:198 #, scheme-format msgid "rolling back ~a...~%" -msgstr "rullar tillbaka ~a...~%" +msgstr "" #: guix/scripts/deploy.scm:193 #, fuzzy, scheme-format @@ -9002,7 +8999,7 @@ msgstr "" #: guix/ui.scm:1621 msgid "debug information" -msgstr "felsökningsinformation" +msgstr "" #: guix/ui.scm:1622 msgid "documentation" @@ -9010,19 +9007,19 @@ msgstr "dokumentation" #: guix/ui.scm:1623 msgid "shared libraries" -msgstr "delade bibliotek" +msgstr "" #: guix/ui.scm:1624 msgid "static libraries" -msgstr "statiska bibliotek" +msgstr "" #: guix/ui.scm:1625 msgid "everything else" -msgstr "allting annat" +msgstr "" #: guix/ui.scm:1639 msgid "[description missing]" -msgstr "[beskrivning saknas]" +msgstr "" #: guix/ui.scm:1661 msgid "everything" @@ -9384,36 +9381,36 @@ msgstr "" msgid "invalid format of the signature field: ~a~%" msgstr "" -#: guix/channels.scm:268 +#: guix/channels.scm:267 msgid "channel dependency has an invalid introduction field" msgstr "" -#: guix/channels.scm:311 +#: guix/channels.scm:310 msgid "unsupported '.guix-channel' version" msgstr "" -#: guix/channels.scm:317 +#: guix/channels.scm:316 msgid "invalid '.guix-channel' file" -msgstr "ogiltig '.guix-kanal' fil" +msgstr "" -#: guix/channels.scm:373 +#: guix/channels.scm:372 #, fuzzy msgid "Authenticating channel '~a', commits ~a to ~a (~h new commit)...~%" msgid_plural "Authenticating channel '~a', commits ~a to ~a (~h new commits)...~%" msgstr[0] "Uppdaterar kanal ”~a” från ett Git-arkiv vid ”~a”…~%" msgstr[1] "Uppdaterar kanal ”~a” från ett Git-arkiv vid ”~a”…~%" -#: guix/channels.scm:444 +#: guix/channels.scm:443 #, scheme-format msgid "channel '~a' lacks 'introduction' field but '.guix-authorizations' found\n" msgstr "" -#: guix/channels.scm:452 +#: guix/channels.scm:451 #, scheme-format msgid "channel '~a' lacks an introduction and cannot be authenticated~%" msgstr "" -#: guix/channels.scm:457 +#: guix/channels.scm:456 msgid "" "Add the missing introduction to your\n" "channels file to address the issue. Alternatively, you can pass\n" @@ -9421,17 +9418,17 @@ msgid "" "thus potentially malicious code." msgstr "" -#: guix/channels.scm:461 +#: guix/channels.scm:460 #, scheme-format msgid "channel authentication disabled~%" msgstr "" -#: guix/channels.scm:486 +#: guix/channels.scm:485 #, scheme-format msgid "aborting update of channel '~a' to commit ~a, which is not a descendant of ~a" msgstr "" -#: guix/channels.scm:501 +#: guix/channels.scm:500 msgid "" "This could indicate that the channel has\n" "been tampered with and is trying to force a roll-back, preventing you from\n" @@ -9439,39 +9436,39 @@ msgid "" "allow non-forward updates." msgstr "" -#: guix/channels.scm:566 +#: guix/channels.scm:565 #, scheme-format msgid "Updating channel '~a' from Git repository at '~a'...~%" msgstr "Uppdaterar kanal ”~a” från ett Git-arkiv vid ”~a”…~%" -#: guix/channels.scm:589 +#: guix/channels.scm:588 #, scheme-format msgid "pulled channel '~a' from a mirror of ~a, which might be stale~%" msgstr "" -#: guix/channels.scm:860 +#: guix/channels.scm:859 msgid "'guix' channel is lacking" msgstr "”guix”-kanal saknas" -#: guix/channels.scm:862 +#: guix/channels.scm:861 msgid "" "Make sure your list of channels\n" "contains one channel named @code{guix} providing the core of Guix." msgstr "" -#: guix/channels.scm:1177 +#: guix/channels.scm:1176 msgid "invalid channel news entry" msgstr "" -#: guix/channels.scm:1195 +#: guix/channels.scm:1194 msgid "syntactically invalid channel news file" msgstr "" -#: guix/channels.scm:1198 +#: guix/channels.scm:1197 msgid "invalid channel news file" msgstr "" -#: guix/packages.scm:607 +#: guix/packages.scm:608 #, fuzzy, scheme-format #| msgid "~a: invalid locale name" msgid "~s: invalid package license~%" @@ -9634,11 +9631,11 @@ msgstr "" #: guix/git.scm:152 msgid "receiving objects" -msgstr "tar emot objekt" +msgstr "" #: guix/git.scm:154 msgid "indexing objects" -msgstr "indexerar objekt" +msgstr "" #: guix/git.scm:190 #, fuzzy, scheme-format @@ -9646,10 +9643,10 @@ msgstr "indexerar objekt" msgid "ignoring invalid certificate for '~a'~%" msgstr "ogiltigt nummer: ~a~%" -#: guix/git.scm:366 guix/git.scm:721 +#: guix/git.scm:366 guix/git.scm:714 #, scheme-format msgid "Git error: ~a~%" -msgstr "Git-fel: ~a~%" +msgstr "" #: guix/git.scm:397 #, scheme-format @@ -9667,17 +9664,17 @@ msgstr "" msgid "compressing cached Git repository at '~a'...~%" msgstr "Uppdaterar kanal ”~a” från ett Git-arkiv vid ”~a”…~%" -#: guix/git.scm:872 +#: guix/git.scm:865 #, scheme-format msgid "cannot fetch commit ~a from ~a: ~a" msgstr "kan inte hämta incheckning ~a från ~a: ~a" -#: guix/git.scm:875 +#: guix/git.scm:868 #, scheme-format msgid "cannot fetch branch '~a' from ~a: ~a" msgstr "kan inte hämta gren ”~a” från ~a: ~a" -#: guix/git.scm:878 +#: guix/git.scm:871 #, scheme-format msgid "Git failure while fetching ~a: ~a" msgstr "Git-fel vid hämtning av ~a: ~a" @@ -9728,7 +9725,7 @@ msgstr "~a: varning: ”~a” är föråldrat~@[, använd ”~a” istället~]~% #: guix/deprecation.scm:50 #, scheme-format msgid "'~a' is deprecated~%" -msgstr "'~a' är föråldrat~%" +msgstr "" #. TRANSLATORS: 'derivation' must not be translated; it refers to the #. 'derivation' procedure. @@ -9976,7 +9973,7 @@ msgstr "" msgid "ignoring invalid file name: '~a'~%" msgstr "ogiltigt nummer: ~a~%" -#: guix/scripts/shell.scm:299 guix/scripts/environment.scm:1204 +#: guix/scripts/shell.scm:299 guix/scripts/environment.scm:1194 #, scheme-format msgid "no packages specified; creating an empty environment~%" msgstr "" @@ -10004,24 +10001,24 @@ msgid "" "@end example\n" msgstr "" -#: guix/scripts/shell.scm:520 +#: guix/scripts/shell.scm:517 msgid "" ";; What follows is a \"manifest\" equivalent to the command line you gave.\n" ";; You can store it in a file that you may then pass to any 'guix' command\n" ";; that accepts a '--manifest' (or '-m') option.\n" msgstr "" -#: guix/scripts/shell.scm:560 +#: guix/scripts/shell.scm:557 msgid "spawn one-off software environments" msgstr "" -#: guix/scripts/shell.scm:587 +#: guix/scripts/shell.scm:584 msgid "" "Consider passing the @option{--check} option once\n" "to make sure your shell does not clobber environment variables." msgstr "" -#: guix/scripts/environment.scm:91 +#: guix/scripts/environment.scm:90 #, fuzzy msgid "" "\n" @@ -10032,7 +10029,7 @@ msgstr "" " -f, --file=FIL bygg paketet eller härdledningen som koden inuti\n" " FIL utvärderas till" -#: guix/scripts/environment.scm:94 +#: guix/scripts/environment.scm:93 #, fuzzy msgid "" "\n" @@ -10042,13 +10039,13 @@ msgstr "" " -m, --manifest=FIL skapa en ny profilgeneration med manifestet\n" " från FIL" -#: guix/scripts/environment.scm:96 +#: guix/scripts/environment.scm:95 msgid "" "\n" " -p, --profile=PATH create environment from profile at PATH" msgstr "" -#: guix/scripts/environment.scm:98 +#: guix/scripts/environment.scm:97 #, fuzzy msgid "" "\n" @@ -10058,7 +10055,7 @@ msgstr "" " --search-paths[=TYP]\n" " visa miljövariabeldefinitioner som behövs" -#: guix/scripts/environment.scm:100 +#: guix/scripts/environment.scm:99 #, fuzzy msgid "" "\n" @@ -10068,7 +10065,7 @@ msgstr "" " --search-paths[=TYP]\n" " visa miljövariabeldefinitioner som behövs" -#: guix/scripts/environment.scm:102 +#: guix/scripts/environment.scm:101 #, fuzzy msgid "" "\n" @@ -10077,7 +10074,7 @@ msgstr "" "\n" " -u, --upgrade[=REGUTR] uppgradera alla interallerade paket som matchar REGUTR" -#: guix/scripts/environment.scm:104 +#: guix/scripts/environment.scm:103 #, fuzzy msgid "" "\n" @@ -10087,20 +10084,20 @@ msgstr "" " --search-paths[=TYP]\n" " visa miljövariabeldefinitioner som behövs" -#: guix/scripts/environment.scm:109 +#: guix/scripts/environment.scm:108 #, fuzzy msgid "" "\n" " -C, --container run command within an isolated container" msgstr " exec kör ett kommando inut en existerande behållare\n" -#: guix/scripts/environment.scm:111 guix/scripts/home.scm:139 +#: guix/scripts/environment.scm:110 guix/scripts/home.scm:137 msgid "" "\n" " -N, --network allow containers to access the network" msgstr "" -#: guix/scripts/environment.scm:113 +#: guix/scripts/environment.scm:112 #, scheme-format msgid "" "\n" @@ -10108,14 +10105,14 @@ msgid "" " an isolated container" msgstr "" -#: guix/scripts/environment.scm:116 +#: guix/scripts/environment.scm:115 #, fuzzy msgid "" "\n" " -W, --nesting make Guix available within the container" msgstr " exec kör ett kommando inut en existerande behållare\n" -#: guix/scripts/environment.scm:118 +#: guix/scripts/environment.scm:117 msgid "" "\n" " -u, --user=USER instead of copying the name and home of the current\n" @@ -10123,41 +10120,41 @@ msgid "" " with home directory /home/USER" msgstr "" -#: guix/scripts/environment.scm:122 +#: guix/scripts/environment.scm:121 msgid "" "\n" " --no-cwd do not share current working directory with an\n" " isolated container" msgstr "" -#: guix/scripts/environment.scm:125 +#: guix/scripts/environment.scm:124 msgid "" "\n" " --writable-root make the container's root file system writable" msgstr "" -#: guix/scripts/environment.scm:128 guix/scripts/home.scm:141 +#: guix/scripts/environment.scm:127 guix/scripts/home.scm:139 msgid "" "\n" " --share=SPEC for containers, share writable host file system\n" " according to SPEC" msgstr "" -#: guix/scripts/environment.scm:131 guix/scripts/home.scm:144 +#: guix/scripts/environment.scm:130 guix/scripts/home.scm:142 msgid "" "\n" " --expose=SPEC for containers, expose read-only host file system\n" " according to SPEC" msgstr "" -#: guix/scripts/environment.scm:134 +#: guix/scripts/environment.scm:133 msgid "" "\n" " -S, --symlink=SPEC for containers, add symlinks to the profile according\n" " to SPEC, e.g. \"/usr/bin/env=bin/env\"." msgstr "" -#: guix/scripts/environment.scm:139 +#: guix/scripts/environment.scm:138 #, fuzzy msgid "" "\n" @@ -10166,18 +10163,18 @@ msgstr "" "\n" " --bootstrap använd laddar-Guile för att bygga profilen" -#: guix/scripts/environment.scm:143 +#: guix/scripts/environment.scm:142 msgid "" "Usage: guix environment [OPTION]... PACKAGE... [-- COMMAND...]\n" "Build an environment that includes the dependencies of PACKAGE and execute\n" "COMMAND or an interactive shell in that environment.\n" msgstr "" -#: guix/scripts/environment.scm:146 +#: guix/scripts/environment.scm:145 msgid "This command is deprecated in favor of 'guix shell'.\n" msgstr "" -#: guix/scripts/environment.scm:150 +#: guix/scripts/environment.scm:149 #, fuzzy msgid "" "\n" @@ -10188,72 +10185,72 @@ msgstr "" " -f, --file=FIL bygg paketet eller härdledningen som koden inuti\n" " FIL utvärderas till" -#: guix/scripts/environment.scm:153 +#: guix/scripts/environment.scm:152 msgid "" "\n" " --ad-hoc include all specified packages in the environment instead\n" " of only their inputs" msgstr "" -#: guix/scripts/environment.scm:216 +#: guix/scripts/environment.scm:215 #, fuzzy, scheme-format msgid "'--inherit' is deprecated, use '--preserve' instead~%" msgstr "~a: varning: ”~a” är föråldrat~@[, använd ”~a” istället~]~%" -#: guix/scripts/environment.scm:375 +#: guix/scripts/environment.scm:374 #, scheme-format msgid "could not add current Guix to the profile~%" msgstr "" -#: guix/scripts/environment.scm:546 +#: guix/scripts/environment.scm:545 #, fuzzy, scheme-format #| msgid "guix: ~a: command not found~%" msgid "~a: command not found~%" msgstr "guix: ~a: kommando hittades inte~%" -#: guix/scripts/environment.scm:624 +#: guix/scripts/environment.scm:623 #, scheme-format msgid "checking the environment variables visible from shell '~a'...~%" msgstr "" -#: guix/scripts/environment.scm:628 +#: guix/scripts/environment.scm:627 #, fuzzy, scheme-format msgid "failed to determine environment of shell '~a'~%" msgstr "Kunde inte bestämma connman-tillstånd." -#: guix/scripts/environment.scm:635 +#: guix/scripts/environment.scm:634 #, scheme-format msgid "variable '~a' is missing from shell environment~%" msgstr "" -#: guix/scripts/environment.scm:642 +#: guix/scripts/environment.scm:641 #, fuzzy, scheme-format #| msgid "package '~a' has been superseded by '~a'~%" msgid "variable '~a' has unexpected suffix '~a'~%" msgstr "paket ”~a” har ersatts av ”~a”~%" -#: guix/scripts/environment.scm:648 +#: guix/scripts/environment.scm:647 #, fuzzy, scheme-format #| msgid "package '~a' has been superseded by '~a'~%" msgid "variable '~a' is clobbered: '~a'~%" msgstr "paket ”~a” har ersatts av ”~a”~%" -#: guix/scripts/environment.scm:655 +#: guix/scripts/environment.scm:654 #, scheme-format msgid "'GUIX_ENVIRONMENT' is missing from the shell environment~%" msgstr "" -#: guix/scripts/environment.scm:659 +#: guix/scripts/environment.scm:658 #, scheme-format msgid "'GUIX_ENVIRONMENT' is set to '~a' instead of '~a'~%" msgstr "" -#: guix/scripts/environment.scm:673 +#: guix/scripts/environment.scm:672 #, scheme-format msgid "'PS1' is the same in sub-shell~%" msgstr "" -#: guix/scripts/environment.scm:674 +#: guix/scripts/environment.scm:673 #, scheme-format msgid "" "Consider setting a different prompt for\n" @@ -10267,7 +10264,7 @@ msgid "" "@end example\n" msgstr "" -#: guix/scripts/environment.scm:687 +#: guix/scripts/environment.scm:686 #, scheme-format msgid "" "One or more environment variables have a\n" @@ -10290,90 +10287,90 @@ msgid "" "running in a \"container\", immune to the issue described above." msgstr "" -#: guix/scripts/environment.scm:706 +#: guix/scripts/environment.scm:705 #, scheme-format msgid "All is good! The shell gets correct environment variables.~%" msgstr "" -#: guix/scripts/environment.scm:727 +#: guix/scripts/environment.scm:726 #, fuzzy, scheme-format msgid "Did you mean '~a'?~%" msgstr "Glömde du @code{(use-modules ~s)}?" -#: guix/scripts/environment.scm:1045 +#: guix/scripts/environment.scm:1035 #, scheme-format msgid "cannot link profile: '~a' already exists within container~%" msgstr "" -#: guix/scripts/environment.scm:1083 +#: guix/scripts/environment.scm:1073 msgid "cannot create container: user namespaces unavailable\n" msgstr "" -#: guix/scripts/environment.scm:1084 +#: guix/scripts/environment.scm:1074 msgid "is your kernel version < 3.10?\n" msgstr "" -#: guix/scripts/environment.scm:1087 +#: guix/scripts/environment.scm:1077 msgid "cannot create container: unprivileged user cannot create user namespaces\n" msgstr "" -#: guix/scripts/environment.scm:1088 +#: guix/scripts/environment.scm:1078 msgid "please set /proc/sys/kernel/unprivileged_userns_clone to \"1\"\n" msgstr "" -#: guix/scripts/environment.scm:1091 +#: guix/scripts/environment.scm:1081 msgid "cannot create container: /proc/self/setgroups does not exist\n" msgstr "" -#: guix/scripts/environment.scm:1092 +#: guix/scripts/environment.scm:1082 msgid "is your kernel version < 3.19?\n" msgstr "" -#: guix/scripts/environment.scm:1118 +#: guix/scripts/environment.scm:1108 msgid "spawn one-off software environments (deprecated)" msgstr "" -#: guix/scripts/environment.scm:1175 +#: guix/scripts/environment.scm:1165 #, scheme-format msgid "'--link-profile' cannot be used without '--container'~%" msgstr "" -#: guix/scripts/environment.scm:1177 +#: guix/scripts/environment.scm:1167 #, scheme-format msgid "'--user' cannot be used without '--container'~%" msgstr "" -#: guix/scripts/environment.scm:1179 +#: guix/scripts/environment.scm:1169 #, scheme-format msgid "--no-cwd cannot be used without '--container'~%" msgstr "" -#: guix/scripts/environment.scm:1181 +#: guix/scripts/environment.scm:1171 #, scheme-format msgid "'--writable-root' cannot be used without '--container'~%" msgstr "" -#: guix/scripts/environment.scm:1183 +#: guix/scripts/environment.scm:1173 #, scheme-format msgid "'--emulate-fhs' cannot be used without '--container'~%" msgstr "" -#: guix/scripts/environment.scm:1185 +#: guix/scripts/environment.scm:1175 #, scheme-format msgid "'--nesting' cannot be used without '--container'~%" msgstr "" -#: guix/scripts/environment.scm:1187 +#: guix/scripts/environment.scm:1177 #, scheme-format msgid "'--symlink' cannot be used without '--container'~%" msgstr "" -#: guix/scripts/environment.scm:1201 +#: guix/scripts/environment.scm:1191 #, scheme-format msgid "'--profile' cannot be used with package options~%" msgstr "" -#: guix/scripts/environment.scm:1243 +#: guix/scripts/environment.scm:1233 #, scheme-format msgid "'--check' is unnecessary when using '--container'; doing nothing~%" msgstr "" @@ -10409,7 +10406,7 @@ msgstr "~a: sökvägstyp stöds inte~%" #: guix/scripts/style.scm:229 #, scheme-format msgid "would be edited~%" -msgstr "skulle bli redigerad~%" +msgstr "" #: guix/scripts/style.scm:441 #, fuzzy, scheme-format @@ -10551,14 +10548,14 @@ msgid "" ";; See the \"Replicating Guix\" section in the manual.\n" msgstr "" -#: guix/scripts/home.scm:98 +#: guix/scripts/home.scm:96 msgid "" "Usage: guix home [OPTION ...] ACTION [ARG ...] [FILE]\n" "Build the home environment declared in FILE according to ACTION.\n" "Some ACTIONS support additional ARGS.\n" msgstr "" -#: guix/scripts/home.scm:104 +#: guix/scripts/home.scm:102 #, fuzzy msgid " search search for existing service types\n" msgstr "" @@ -10566,7 +10563,7 @@ msgstr "" " --search-paths[=TYP]\n" " visa miljövariabeldefinitioner som behövs" -#: guix/scripts/home.scm:106 +#: guix/scripts/home.scm:104 #, fuzzy msgid " edit edit the definition of an existing service type\n" msgstr "" @@ -10574,18 +10571,18 @@ msgstr "" " --search-paths[=TYP]\n" " visa miljövariabeldefinitioner som behövs" -#: guix/scripts/home.scm:108 +#: guix/scripts/home.scm:106 #, fuzzy msgid "" "\n" " container run the home environment configuration in a container\n" msgstr " exec kör ett kommando inut en existerande behållare\n" -#: guix/scripts/home.scm:110 +#: guix/scripts/home.scm:108 msgid " reconfigure switch to a new home environment configuration\n" msgstr "" -#: guix/scripts/home.scm:112 +#: guix/scripts/home.scm:110 #, fuzzy #| msgid "" #| "\n" @@ -10595,39 +10592,39 @@ msgstr "" "\n" " --roll-back rulla tillbaka till föregående generation" -#: guix/scripts/home.scm:114 +#: guix/scripts/home.scm:112 msgid " describe describe the current home environment\n" msgstr "" -#: guix/scripts/home.scm:116 +#: guix/scripts/home.scm:114 msgid " list-generations list the home environment generations\n" msgstr "" -#: guix/scripts/home.scm:118 +#: guix/scripts/home.scm:116 msgid " switch-generation switch to an existing home environment configuration\n" msgstr "" -#: guix/scripts/home.scm:120 +#: guix/scripts/home.scm:118 msgid " delete-generations delete old home environment generations\n" msgstr "" -#: guix/scripts/home.scm:122 +#: guix/scripts/home.scm:120 msgid " build build the home environment without installing anything\n" msgstr "" -#: guix/scripts/home.scm:124 +#: guix/scripts/home.scm:122 msgid " import generates a home environment definition from dotfiles\n" msgstr "" -#: guix/scripts/home.scm:126 +#: guix/scripts/home.scm:124 msgid " extension-graph emit the service extension graph\n" msgstr "" -#: guix/scripts/home.scm:128 +#: guix/scripts/home.scm:126 msgid " shepherd-graph emit the graph of shepherd services\n" msgstr "" -#: guix/scripts/home.scm:132 +#: guix/scripts/home.scm:130 #, fuzzy msgid "" "\n" @@ -10638,7 +10635,7 @@ msgstr "" " -f, --file=FIL bygg paketet eller härdledningen som koden inuti\n" " FIL utvärderas till" -#: guix/scripts/home.scm:154 +#: guix/scripts/home.scm:152 #, fuzzy #| msgid "" #| "\n" @@ -10782,12 +10779,12 @@ msgstr "" #: guix/scripts/import.scm:112 #, scheme-format msgid "'~a' import failed~%" -msgstr "'~a' importen misslyckades~%" +msgstr "" #: guix/scripts/import.scm:114 #, scheme-format msgid "~a: invalid importer~%" -msgstr "~a: ogiltig importerare~%" +msgstr "" #: guix/scripts/import.scm:121 msgid "import a package definition from an external repository" @@ -10798,27 +10795,21 @@ msgstr "" msgid "guix import: missing importer name~%" msgstr "" -#: guix/import/utils.scm:233 -#, fuzzy, scheme-format -#| msgid "failed to fetch Git repository for ~a~%" -msgid "failed to download Git repository ~a: ~a~%" -msgstr "lyckades inte hämta Git arkiv för ~a~%" - -#: guix/import/utils.scm:411 +#: guix/import/utils.scm:339 msgid "This package lacks a description. Run \"info '(guix) Synopses and Descriptions'\" for more information." msgstr "" -#: guix/import/utils.scm:495 +#: guix/import/utils.scm:423 msgid "This package lacks a synopsis. Run \"info '(guix) Synopses and Descriptions'\" for more information." msgstr "" -#: guix/import/composer.scm:236 guix/import/stackage.scm:158 +#: guix/import/composer.scm:262 guix/import/stackage.scm:158 #, fuzzy, scheme-format #| msgid "~a: failed to parse URI~%" msgid "failed to parse ~a~%" msgstr "~a: misslyckades med att tolka URI~%" -#: guix/import/composer.scm:242 +#: guix/import/composer.scm:268 #, fuzzy #| msgid "Updater for X.org packages" msgid "Updater for Composer packages" @@ -10857,7 +10848,7 @@ msgstr "hittade giltig signatur för ”~a”~%" #: guix/scripts/import/texlive.scm:101 #, scheme-format msgid "too few arguments~%" -msgstr "för få argument~%" +msgstr "" #: guix/scripts/import/cpan.scm:103 guix/scripts/import/cran.scm:137 #: guix/scripts/import/crate.scm:148 guix/scripts/import/egg.scm:108 @@ -10869,9 +10860,9 @@ msgstr "för få argument~%" #: guix/scripts/import/stackage.scm:132 guix/scripts/import/texlive.scm:103 #, scheme-format msgid "too many arguments~%" -msgstr "för många argument~%" +msgstr "" -#: guix/import/cpan.scm:336 guix/import/elpa.scm:420 guix/import/opam.scm:425 +#: guix/import/cpan.scm:336 guix/import/elpa.scm:436 guix/import/opam.scm:425 #: guix/import/stackage.scm:151 #, scheme-format msgid "~a updater doesn't support updating to a specific version, sorry." @@ -11056,23 +11047,23 @@ msgstr "" msgid "this importer does not consider the version~%" msgstr "" -#: guix/import/elpa.scm:109 +#: guix/import/elpa.scm:108 #, scheme-format msgid "~A: currently not supported~%" msgstr "~A: stöds för närvarande inte~%" -#: guix/import/elpa.scm:121 +#: guix/import/elpa.scm:120 #, scheme-format msgid "~A: download failed~%" msgstr "~A: hämtning misslyckades~%" -#: guix/import/elpa.scm:259 +#: guix/import/elpa.scm:276 #, fuzzy, scheme-format #| msgid "Unsupported MELPA fetcher: ~a, falling back to unstable MELPA source.~%" msgid "unsupported MELPA fetcher: ~a, falling back to unstable MELPA source~%" msgstr "Icke-stöd MELPA hämtare: ~a, faller tillbaka till ostabil MELPA källa.~%" -#: guix/import/elpa.scm:468 +#: guix/import/elpa.scm:484 msgid "Updater for ELPA packages" msgstr "Uppdaterare för OPAM-paket" @@ -11213,53 +11204,59 @@ msgstr "" msgid "failed to download meta-data for module '~a'.~%" msgstr "hittade giltig signatur för ”~a”~%" -#: guix/import/go.scm:152 +#: guix/import/go.scm:151 #, scheme-format msgid "Empty list of versions on proxy ~a for package '~a'. Using latest.~%" msgstr "" -#: guix/import/go.scm:159 +#: guix/import/go.scm:158 #, scheme-format msgid "No versions available for '~a' on proxy ~a." msgstr "" -#: guix/import/go.scm:485 +#: guix/import/go.scm:484 #, fuzzy, scheme-format msgid "Unable to determine repository root of '~a'. Guessing '~a'.~%" msgstr "Kunde inte bestämma connman-tillstånd." -#: guix/import/go.scm:533 +#: guix/import/go.scm:532 #, scheme-format msgid "no element in result when accessing module path '~a' using go-get" msgstr "" -#: guix/import/go.scm:543 +#: guix/import/go.scm:542 #, scheme-format msgid "unable to parse when accessing module path '~a' using go-get" msgstr "" -#: guix/import/go.scm:604 +#: guix/import/go.scm:573 +#, fuzzy, scheme-format +#| msgid "failed to fetch Git repository for ~a~%" +msgid "failed to check out ~s from Git repository at '~a': ~a~%" +msgstr "lyckades inte hämta Git arkiv för ~a~%" + +#: guix/import/go.scm:635 #, scheme-format msgid "unsupported vcs type '~a' for package '~a'" msgstr "Icke-stöd vcs-typ ”~a” för paket ”~a”" -#: guix/import/go.scm:627 +#: guix/import/go.scm:658 #, fuzzy, scheme-format #| msgid "input '~a' of ~a is in Perl core~%" msgid "version ~a of ~a is not available~%" msgstr "inmatning ”~a” av ~a finns i Perl core~%" -#: guix/import/go.scm:630 +#: guix/import/go.scm:661 #, scheme-format msgid "Pick one of the following available versions:~{ ~a~}." msgstr "" -#: guix/import/go.scm:721 +#: guix/import/go.scm:752 #, fuzzy, scheme-format msgid "Importing package ~s...~%" msgstr "misslyckades med att läsa in ”~a”: ~a~%" -#: guix/import/go.scm:723 +#: guix/import/go.scm:754 #, scheme-format msgid "" "Failed to import package ~s.\n" @@ -11270,7 +11267,7 @@ msgstr "" "anledning: ~s kunde inte bli hämtad: HTTP fel ~a (~s).\n" "Detta paket och dess beroende kommer inte att bli importerade.~%" -#: guix/import/go.scm:733 guix/import/go.scm:742 +#: guix/import/go.scm:764 guix/import/go.scm:773 #, fuzzy, scheme-format #| msgid "" #| "Failed to import package ~s.\n" @@ -11696,48 +11693,42 @@ msgstr "" msgid "invalid arguments: ~{~s ~}~%" msgstr "ogiltigt argument: ~a~%" -#: guix/scripts/perform-download.scm:102 -#, fuzzy, scheme-format -#| msgid "profile '~a' does not exist~%" -msgid "~S is not in the store~%" -msgstr "profil ”~a” existerar inte~%" - -#: guix/scripts/perform-download.scm:123 +#: guix/scripts/perform-download.scm:61 #, scheme-format msgid "~a: missing URL~%" -msgstr "~a: URL saknas~%" +msgstr "" -#: guix/scripts/perform-download.scm:184 +#: guix/scripts/perform-download.scm:107 #, scheme-format msgid "~a: missing Git URL~%" msgstr "" -#: guix/scripts/perform-download.scm:186 +#: guix/scripts/perform-download.scm:109 #, fuzzy, scheme-format #| msgid "guix: missing command name~%" msgid "~a: missing Git commit~%" msgstr "guix: saknar kommandonamn~%" -#: guix/scripts/perform-download.scm:215 +#: guix/scripts/perform-download.scm:138 #, scheme-format msgid "refusing to run with elevated privileges (UID ~a)~%" msgstr "" -#: guix/scripts/perform-download.scm:220 +#: guix/scripts/perform-download.scm:143 msgid "perform download described by fixed-output derivations" msgstr "" -#: guix/scripts/perform-download.scm:250 +#: guix/scripts/perform-download.scm:168 #, fuzzy, scheme-format msgid "~a: unknown builtin builder" msgstr "~A: okänt paket~%" -#: guix/scripts/perform-download.scm:256 +#: guix/scripts/perform-download.scm:174 #, scheme-format msgid "~a is not a fixed-output derivation~%" msgstr "" -#: guix/scripts/perform-download.scm:264 +#: guix/scripts/perform-download.scm:182 #, scheme-format msgid "fixed-output derivation and output file name expected~%" msgstr "" @@ -11875,7 +11866,7 @@ msgstr "" #: guix/scripts/refresh.scm:344 #, scheme-format msgid "Available updaters:~%" -msgstr "Tillgängliga uppdaterare:~%" +msgstr "" #. TRANSLATORS: The parenthetical expression here is rendered #. like "(42% coverage)" and denotes the fraction of packages @@ -12182,11 +12173,6 @@ msgid_plural "socket-activated with %1% sockets" msgstr[0] "" msgstr[1] "" -#, fuzzy, scheme-format -#~| msgid "failed to fetch Git repository for ~a~%" -#~ msgid "failed to check out ~s from Git repository at '~a': ~a~%" -#~ msgstr "lyckades inte hämta Git arkiv för ~a~%" - #, fuzzy #~| msgid "" #~| "\n"