Merge branch 'master' into mesa-updates
Change-Id: Icf1dd47b3e0780d16887014bdacb0dbc891bfec5
This commit is contained in:
John Kehayias
commit
f7bca895b9
28
Makefile.am
28
Makefile.am
@ -147,47 +147,49 @@ MODULES = \
|
||||
guix/build-system/agda.scm \
|
||||
guix/build-system/android-ndk.scm \
|
||||
guix/build-system/ant.scm \
|
||||
guix/build-system/asdf.scm \
|
||||
guix/build-system/cargo.scm \
|
||||
guix/build-system/channel.scm \
|
||||
guix/build-system/chicken.scm \
|
||||
guix/build-system/clojure.scm \
|
||||
guix/build-system/cmake.scm \
|
||||
guix/build-system/copy.scm \
|
||||
guix/build-system/composer.scm \
|
||||
guix/build-system/dub.scm \
|
||||
guix/build-system/dune.scm \
|
||||
guix/build-system/elm.scm \
|
||||
guix/build-system/emacs.scm \
|
||||
guix/build-system/font.scm \
|
||||
guix/build-system/go.scm \
|
||||
guix/build-system/meson.scm \
|
||||
guix/build-system/mozilla.scm \
|
||||
guix/build-system/minify.scm \
|
||||
guix/build-system/minetest.scm \
|
||||
guix/build-system/asdf.scm \
|
||||
guix/build-system/copy.scm \
|
||||
guix/build-system/glib-or-gtk.scm \
|
||||
guix/build-system/gnu.scm \
|
||||
guix/build-system/go.scm \
|
||||
guix/build-system/guile.scm \
|
||||
guix/build-system/haskell.scm \
|
||||
guix/build-system/julia.scm \
|
||||
guix/build-system/linux-module.scm \
|
||||
guix/build-system/maven.scm \
|
||||
guix/build-system/meson.scm \
|
||||
guix/build-system/minetest.scm \
|
||||
guix/build-system/minify.scm \
|
||||
guix/build-system/mix.scm \
|
||||
guix/build-system/mozilla.scm \
|
||||
guix/build-system/node.scm \
|
||||
guix/build-system/ocaml.scm \
|
||||
guix/build-system/perl.scm \
|
||||
guix/build-system/pyproject.scm \
|
||||
guix/build-system/python.scm \
|
||||
guix/build-system/renpy.scm \
|
||||
guix/build-system/ocaml.scm \
|
||||
guix/build-system/qt.scm \
|
||||
guix/build-system/waf.scm \
|
||||
guix/build-system/r.scm \
|
||||
guix/build-system/rakudo.scm \
|
||||
guix/build-system/rebar.scm \
|
||||
guix/build-system/renpy.scm \
|
||||
guix/build-system/ruby.scm \
|
||||
guix/build-system/scons.scm \
|
||||
guix/build-system/texlive.scm \
|
||||
guix/build-system/tree-sitter.scm \
|
||||
guix/build-system/trivial.scm \
|
||||
guix/build-system/vim.scm \
|
||||
guix/build-system/waf.scm \
|
||||
guix/build-system/zig.scm \
|
||||
guix/ftp-client.scm \
|
||||
guix/http-client.scm \
|
||||
@ -211,6 +213,7 @@ MODULES = \
|
||||
guix/build/cargo-utils.scm \
|
||||
guix/build/chicken-build-system.scm \
|
||||
guix/build/cmake-build-system.scm \
|
||||
guix/build/composer-build-system.scm \
|
||||
guix/build/dub-build-system.scm \
|
||||
guix/build/dune-build-system.scm \
|
||||
guix/build/elm-build-system.scm \
|
||||
@ -232,6 +235,7 @@ MODULES = \
|
||||
guix/build/guile-build-system.scm \
|
||||
guix/build/maven-build-system.scm \
|
||||
guix/build/minetest-build-system.scm \
|
||||
guix/build/mix-build-system.scm \
|
||||
guix/build/node-build-system.scm \
|
||||
guix/build/perl-build-system.scm \
|
||||
guix/build/pyproject-build-system.scm \
|
||||
@ -281,6 +285,7 @@ MODULES = \
|
||||
guix/search-paths.scm \
|
||||
guix/packages.scm \
|
||||
guix/import/cabal.scm \
|
||||
guix/import/composer.scm \
|
||||
guix/import/cpan.scm \
|
||||
guix/import/cran.scm \
|
||||
guix/import/crate.scm \
|
||||
@ -339,6 +344,7 @@ MODULES = \
|
||||
guix/scripts/home/import.scm \
|
||||
guix/scripts/lint.scm \
|
||||
guix/scripts/challenge.scm \
|
||||
guix/scripts/import/composer.scm \
|
||||
guix/scripts/import/crate.scm \
|
||||
guix/scripts/import/cpan.scm \
|
||||
guix/scripts/import/cran.scm \
|
||||
@ -416,6 +422,7 @@ dist_noinst_DATA = \
|
||||
AUX_FILES = \
|
||||
gnu/packages/aux-files/chromium/master-preferences.json \
|
||||
gnu/packages/aux-files/emacs/guix-emacs.el \
|
||||
gnu/packages/aux-files/findclass.php \
|
||||
gnu/packages/aux-files/guix.vim \
|
||||
gnu/packages/aux-files/linux-libre/6.6-arm.conf \
|
||||
gnu/packages/aux-files/linux-libre/6.6-arm64.conf \
|
||||
@ -507,6 +514,7 @@ SCM_TESTS = \
|
||||
tests/challenge.scm \
|
||||
tests/channels.scm \
|
||||
tests/combinators.scm \
|
||||
tests/composer.scm \
|
||||
tests/containers.scm \
|
||||
tests/cpan.scm \
|
||||
tests/cpio.scm \
|
||||
|
||||
@ -167,6 +167,16 @@ Guix Profiles in Practice
|
||||
* The benefits of manifests::
|
||||
* Reproducible profiles::
|
||||
|
||||
Software Development
|
||||
|
||||
* Getting Started:: Step 0: using `guix shell'.
|
||||
* Building with Guix:: Step 1: building your code.
|
||||
* The Repository as a Channel:: Step 2: turning the repo in a channel.
|
||||
* Package Variants:: Bonus: Defining variants.
|
||||
* Setting Up Continuous Integration:: Step 3: continuous integration.
|
||||
* Build Manifest:: Bonus: Manifest.
|
||||
* Wrapping Up:: Recap.
|
||||
|
||||
Environment management
|
||||
|
||||
* Guix environment via direnv:: Setup Guix environment with direnv
|
||||
|
||||
@ -9598,6 +9598,20 @@ debugging information''), which roughly means that code is compiled with
|
||||
@code{-O2 -g}, as is the case for Autoconf-based packages by default.
|
||||
@end defvar
|
||||
|
||||
@defvar composer-build-system
|
||||
This variable is exported by @code{(guix build-system composer)}. It
|
||||
implements the build procedure for packages using
|
||||
@url{https://getcomposer.org/, Composer}, the PHP package manager.
|
||||
|
||||
It automatically adds the @code{php} package to the set of inputs. Which
|
||||
package is used can be specified with the @code{#:php} parameter.
|
||||
|
||||
The @code{#:test-target} parameter is used to control which script is run
|
||||
for the tests. By default, the @code{test} script is run if it exists. If
|
||||
the script does not exist, the build system will run @code{phpunit} from the
|
||||
source directory, assuming there is a @file{phpunit.xml} file.
|
||||
@end defvar
|
||||
|
||||
@defvar dune-build-system
|
||||
This variable is exported by @code{(guix build-system dune)}. It
|
||||
supports builds of packages using @uref{https://dune.build/, Dune}, a build
|
||||
@ -14533,6 +14547,26 @@ repository used by the OCaml community.
|
||||
|
||||
Additional options include:
|
||||
|
||||
@table @code
|
||||
@item --recursive
|
||||
@itemx -r
|
||||
Traverse the dependency graph of the given upstream package recursively
|
||||
and generate package expressions for all those packages that are not yet
|
||||
in Guix.
|
||||
@end table
|
||||
|
||||
@item composer
|
||||
@cindex Composer
|
||||
@cindex PHP
|
||||
Import metadata from the @uref{https://getcomposer.org/, Composer} package
|
||||
archive used by the PHP community, as in this example:
|
||||
|
||||
@example
|
||||
guix import composer phpunit/phpunit
|
||||
@end example
|
||||
|
||||
Additional options include:
|
||||
|
||||
@table @code
|
||||
@item --recursive
|
||||
@itemx -r
|
||||
@ -45875,6 +45909,11 @@ This optional string field is only relevant if the kernel is Linux. In
|
||||
that case, it corresponds to the ARCH variable used when building Linux,
|
||||
@code{"mips"} for instance.
|
||||
|
||||
@item @code{rust-target} (default: @code{#false})
|
||||
This optional string field is used to determine which rust target is best
|
||||
supported by this platform. For example, the base level system targeted by
|
||||
@code{armhf-linux} system is closest to @code{armv7-unknown-linux-gnueabihf}.
|
||||
|
||||
@item @code{glibc-dynamic-linker}
|
||||
This field is the name of the GNU C Library dynamic linker for the
|
||||
corresponding system, as a string. It can be
|
||||
|
||||
@ -31,8 +31,9 @@
|
||||
(srfi srfi-1))
|
||||
|
||||
(use-package-modules
|
||||
base bootloaders commencement compression file gawk gdb gettext gtk guile
|
||||
hurd less m4 package-management python ssh version-control)
|
||||
autotools base bootloaders commencement compression file gawk gdb gettext gtk
|
||||
guile guile-xyz hurd less m4 package-management python ssh
|
||||
texinfo tls version-control)
|
||||
|
||||
(define (input->package input)
|
||||
"Return the INPUT as package, or #f."
|
||||
@ -63,8 +64,12 @@
|
||||
diffutils file findutils gawk grep gzip less m4 openssh-sans-x tar xz
|
||||
|
||||
;; development packages
|
||||
autoconf automake libtool texinfo
|
||||
gcc-toolchain gdb-minimal git-minimal gnu-make
|
||||
gettext-minimal python-minimal
|
||||
guile-3.0 guile-2.2 guile-2.0
|
||||
guile-readline guile-colorized
|
||||
guile-gnutls guile-fibers guile-json-4
|
||||
|
||||
;; ourselves!
|
||||
(package-without-tests guix)
|
||||
|
||||
@ -676,6 +676,10 @@ GLib/GIO, GTK, GStreamer and Webkit."
|
||||
"ekaitz@elenq.tech")
|
||||
bootstrap zig)
|
||||
|
||||
(define-member (person "Clément Lassieur"
|
||||
"clement@lassieur.org")
|
||||
mozilla)
|
||||
|
||||
|
||||
(define (find-team name)
|
||||
(or (hash-ref %teams (string->symbol name))
|
||||
|
||||
@ -373,7 +373,7 @@ valid. Append SUFFIX to the job name."
|
||||
|
||||
(define %x86-64-micro-architectures
|
||||
;; Micro-architectures for which we build tuned variants.
|
||||
'("westmere" "ivybridge" "haswell" "skylake" "skylake-avx512"))
|
||||
'("haswell" "skylake" "x86-64-v2" "x86-64-v3" "x86-64-v4"))
|
||||
|
||||
(define (tuned-package-jobs store package system)
|
||||
"Return a list of jobs for PACKAGE tuned for SYSTEM's micro-architectures."
|
||||
|
||||
@ -245,6 +245,7 @@ GNU_SYSTEM_MODULES = \
|
||||
%D%/packages/electronics.scm \
|
||||
%D%/packages/elf.scm \
|
||||
%D%/packages/elixir.scm \
|
||||
%D%/packages/elixir-xyz.scm \
|
||||
%D%/packages/elm.scm \
|
||||
%D%/packages/embedded.scm \
|
||||
%D%/packages/emacs.scm \
|
||||
@ -507,6 +508,7 @@ GNU_SYSTEM_MODULES = \
|
||||
%D%/packages/photo.scm \
|
||||
%D%/packages/phabricator.scm \
|
||||
%D%/packages/php.scm \
|
||||
%D%/packages/php-xyz.scm \
|
||||
%D%/packages/piet.scm \
|
||||
%D%/packages/pikchr.scm \
|
||||
%D%/packages/pkg-config.scm \
|
||||
@ -1188,6 +1190,8 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/freedink-engine-fix-sdl-hints.patch \
|
||||
%D%/packages/patches/freeimage-libtiff-compat.patch \
|
||||
%D%/packages/patches/freeimage-unbundle.patch \
|
||||
%D%/packages/patches/freeimage-CVE-2020-21428.patch \
|
||||
%D%/packages/patches/freeimage-CVE-2020-22524.patch \
|
||||
%D%/packages/patches/fulcrum-1.9.1-unbundled-libraries.patch \
|
||||
%D%/packages/patches/fuse-glibc-2.34.patch \
|
||||
%D%/packages/patches/fuse-overlapping-headers.patch \
|
||||
|
||||
@ -61,6 +61,7 @@
|
||||
;;; Copyright © 2023 Alexey Abramov <levenson@mmer.org>
|
||||
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
|
||||
;;; Copyright © 2023 Tobias Kortkamp <tobias.kortkamp@gmail.com>
|
||||
;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -4019,7 +4020,7 @@ you are running, what theme or icon set you are using, etc.")
|
||||
(define-public hyfetch
|
||||
(package
|
||||
(name "hyfetch")
|
||||
(version "1.4.10")
|
||||
(version "1.4.11")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -4029,7 +4030,7 @@ you are running, what theme or icon set you are using, etc.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1lf1vrasinda9j6yazznpx54gg5j24xvkjb68dxhby9dg8ql1h87"))))
|
||||
"1ymj72virh8y8gwgg3j3skf6j0zn7p0plcza57lln1drnjspycy7"))))
|
||||
(build-system python-build-system)
|
||||
(arguments (list #:tests? #f)) ;no tests
|
||||
(inputs (list python-typing-extensions))
|
||||
|
||||
125
gnu/packages/aux-files/findclass.php
Normal file
125
gnu/packages/aux-files/findclass.php
Normal file
@ -0,0 +1,125 @@
|
||||
<?php
|
||||
/**
|
||||
* The content of this file is copied from composer's src/Composer/Autoload/ClassMapGenerator.php
|
||||
* the findClasses method was extracted, to prevent using any dependency.
|
||||
*
|
||||
* Composer (and thus this file) is distributed under the expat license, and
|
||||
* ClassMapGenerator.php also contains this notice:
|
||||
*
|
||||
* This file is part of Composer.
|
||||
*
|
||||
* (c) Nils Adermann <naderman@naderman.de>
|
||||
* Jordi Boggiano <j.boggiano@seld.be>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*
|
||||
* This file is copied from the Symfony package.
|
||||
*
|
||||
* (c) Fabien Potencier <fabien@symfony.com>
|
||||
*
|
||||
* To the extent to wich it makes sense, as the author of the extract:
|
||||
* Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
|
||||
*/
|
||||
|
||||
/**
|
||||
* Extract the classes in the given file
|
||||
*
|
||||
* @param string $path The file to check
|
||||
* @throws \RuntimeException
|
||||
* @return array The found classes
|
||||
*/
|
||||
function findClasses($path)
|
||||
{
|
||||
$extraTypes = PHP_VERSION_ID < 50400 ? '' : '|trait';
|
||||
if (defined('HHVM_VERSION') && version_compare(HHVM_VERSION, '3.3', '>=')) {
|
||||
$extraTypes .= '|enum';
|
||||
}
|
||||
// Use @ here instead of Silencer to actively suppress 'unhelpful' output
|
||||
// @link https://github.com/composer/composer/pull/4886
|
||||
$contents = @php_strip_whitespace($path);
|
||||
if (!$contents) {
|
||||
if (!file_exists($path)) {
|
||||
$message = 'File at "%s" does not exist, check your classmap definitions';
|
||||
} elseif (!is_readable($path)) {
|
||||
$message = 'File at "%s" is not readable, check its permissions';
|
||||
} elseif ('' === trim(file_get_contents($path))) {
|
||||
// The input file was really empty and thus contains no classes
|
||||
return array();
|
||||
} else {
|
||||
$message = 'File at "%s" could not be parsed as PHP, it may be binary or corrupted';
|
||||
}
|
||||
$error = error_get_last();
|
||||
if (isset($error['message'])) {
|
||||
$message .= PHP_EOL . 'The following message may be helpful:' . PHP_EOL . $error['message'];
|
||||
}
|
||||
throw new \RuntimeException(sprintf($message, $path));
|
||||
}
|
||||
// return early if there is no chance of matching anything in this file
|
||||
if (!preg_match('{\b(?:class|interface'.$extraTypes.')\s}i', $contents)) {
|
||||
return array();
|
||||
}
|
||||
// strip heredocs/nowdocs
|
||||
$contents = preg_replace('{<<<[ \t]*([\'"]?)(\w+)\\1(?:\r\n|\n|\r)(?:.*?)(?:\r\n|\n|\r)(?:\s*)\\2(?=\s+|[;,.)])}s', 'null', $contents);
|
||||
// strip strings
|
||||
$contents = preg_replace('{"[^"\\\\]*+(\\\\.[^"\\\\]*+)*+"|\'[^\'\\\\]*+(\\\\.[^\'\\\\]*+)*+\'}s', 'null', $contents);
|
||||
// strip leading non-php code if needed
|
||||
if (substr($contents, 0, 2) !== '<?') {
|
||||
$contents = preg_replace('{^.+?<\?}s', '<?', $contents, 1, $replacements);
|
||||
if ($replacements === 0) {
|
||||
return array();
|
||||
}
|
||||
}
|
||||
// strip non-php blocks in the file
|
||||
$contents = preg_replace('{\?>(?:[^<]++|<(?!\?))*+<\?}s', '?><?', $contents);
|
||||
// strip trailing non-php code if needed
|
||||
$pos = strrpos($contents, '?>');
|
||||
if (false !== $pos && false === strpos(substr($contents, $pos), '<?')) {
|
||||
$contents = substr($contents, 0, $pos);
|
||||
}
|
||||
// strip comments if short open tags are in the file
|
||||
if (preg_match('{(<\?)(?!(php|hh))}i', $contents)) {
|
||||
$contents = preg_replace('{//.* | /\*(?:[^*]++|\*(?!/))*\*/}x', '', $contents);
|
||||
}
|
||||
preg_match_all('{
|
||||
(?:
|
||||
\b(?<![\$:>])(?P<type>class|interface'.$extraTypes.') \s++ (?P<name>[a-zA-Z_\x7f-\xff:][a-zA-Z0-9_\x7f-\xff:\-]*+)
|
||||
| \b(?<![\$:>])(?P<ns>namespace) (?P<nsname>\s++[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\s*+\\\\\s*+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+)*+)? \s*+ [\{;]
|
||||
)
|
||||
}ix', $contents, $matches);
|
||||
$classes = array();
|
||||
$namespace = '';
|
||||
for ($i = 0, $len = count($matches['type']); $i < $len; $i++) {
|
||||
if (!empty($matches['ns'][$i])) {
|
||||
$namespace = str_replace(array(' ', "\t", "\r", "\n"), '', $matches['nsname'][$i]) . '\\';
|
||||
} else {
|
||||
$name = $matches['name'][$i];
|
||||
// skip anon classes extending/implementing
|
||||
if ($name === 'extends' || $name === 'implements') {
|
||||
continue;
|
||||
}
|
||||
if ($name[0] === ':') {
|
||||
// This is an XHP class, https://github.com/facebook/xhp
|
||||
$name = 'xhp'.substr(str_replace(array('-', ':'), array('_', '__'), $name), 1);
|
||||
} elseif ($matches['type'][$i] === 'enum') {
|
||||
// In Hack, something like:
|
||||
// enum Foo: int { HERP = '123'; }
|
||||
// The regex above captures the colon, which isn't part of
|
||||
// the class name.
|
||||
$name = rtrim($name, ':');
|
||||
}
|
||||
$classes[] = ltrim($namespace . $name, '\\');
|
||||
}
|
||||
}
|
||||
return $classes;
|
||||
}
|
||||
|
||||
$options = getopt('i:f:', []);
|
||||
$file = $options["f"];
|
||||
$input = $options["i"];
|
||||
|
||||
$classes = findClasses($file);
|
||||
foreach($classes as $class) {
|
||||
echo '$classmap[\''.$class.'\'] = \''.$input.'/'.$file.'\';';
|
||||
echo "\n";
|
||||
}
|
||||
@ -320,9 +320,9 @@ runtime.")
|
||||
(toolchain (assoc-ref inputs "cross-toolchain"))
|
||||
(includes (string-append
|
||||
toolchain
|
||||
"/arm-none-eabi/include:"
|
||||
"/arm-none-eabi/include/c++:"
|
||||
toolchain
|
||||
"/arm-none-eabi/include/arm-none-eabi/armv7e-m")))
|
||||
"/arm-none-eabi/include/c++/arm-none-eabi/armv7e-m")))
|
||||
(display
|
||||
(string-append "#!" (which "sh") "\n"
|
||||
"export CROSS_CPATH=" includes "\n"
|
||||
@ -333,8 +333,7 @@ runtime.")
|
||||
" -Daxoloti_release=" runtime
|
||||
" -Daxoloti_runtime=" runtime
|
||||
" -jar " dir "/Axoloti.jar")))))
|
||||
(chmod target #o555))
|
||||
#t)))
|
||||
(chmod target #o555)))))
|
||||
(add-after 'install 'strip-jar-timestamps
|
||||
(assoc-ref ant:%standard-phases 'strip-jar-timestamps)))))
|
||||
(inputs
|
||||
|
||||
@ -10245,24 +10245,23 @@ auROC analysis.")
|
||||
(license license:gpl3))))
|
||||
|
||||
(define-public r-sccustomize
|
||||
(let ((commit "8414d1f5fb32277855b0619191a568932b7baeb0")
|
||||
(let ((commit "397374590dae2ccc0c560897dcd1ce4382c18798")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "r-sccustomize")
|
||||
(version (git-version "0.7.0" revision commit))
|
||||
(source (origin
|
||||
(version (git-version "2.0.1" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/samuel-marsh/scCustomize")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1wcgfq7lx83a2kf8pjbw524gdvxf351n08cwd5wzmmy57kf4knbj"))))
|
||||
(base32 "11bafm0mlck27fqd8brz80pxb8dc5q0aqbp8zv0s9sx97njp7wsl"))))
|
||||
(properties `((upstream-name . "scCustomize")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
(list r-circlize
|
||||
(propagated-inputs (list r-circlize
|
||||
r-colorway
|
||||
r-cowplot
|
||||
r-data-table
|
||||
|
||||
@ -57,7 +57,7 @@ supported content to the Kodi media center.")
|
||||
;; Arbitrary commit of branch master,
|
||||
;; Update when updating uBlockOrigin.
|
||||
(let* ((name "ublock-main-assets")
|
||||
(commit "d93605b8584df8cd47bcc91b3d932feecd9e3a2a")
|
||||
(commit "76bd7cb53036a36f7e7df5ee9173f588ba8aa966")
|
||||
(revision "1")
|
||||
(version (git-version "0" revision commit)))
|
||||
(origin
|
||||
@ -67,13 +67,13 @@ supported content to the Kodi media center.")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1bbwxmb5rb1afh6i5a7m1ysaw0022wi5g091vpahi4h805p1s7a2")))))
|
||||
(base32 "1kdzvflr1yxykyva5vsjqr0p2ik1200xbhxwpl3cx2jsiv8l95sk")))))
|
||||
|
||||
(define ublock-prod-assets
|
||||
;; Arbitrary commit of branch gh-pages,
|
||||
;; Update when updating uBlockOrigin.
|
||||
(let* ((name "ublock-prod-assets")
|
||||
(commit "1d3df32ef6672763f44b27a95fd5cb3b5770d5e2")
|
||||
(commit "a379a168fc149ffbd6d10cd0700d4ab4801e57f2")
|
||||
(revision "1")
|
||||
(version (git-version "0" revision commit)))
|
||||
(origin
|
||||
@ -83,12 +83,12 @@ supported content to the Kodi media center.")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1cbx7w1nzdcjq0z4z7j9nr8922i27nslprrw5dy03xcdqwc3x4l6")))))
|
||||
(base32 "0syf3kbhvsbn5xka5knpclxby2kp92my1w7ixvf5fs9n08ylcip1")))))
|
||||
|
||||
(define ublock-origin
|
||||
(package
|
||||
(name "ublock-origin")
|
||||
(version "1.53.2")
|
||||
(version "1.54.0")
|
||||
(home-page "https://github.com/gorhill/uBlock")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
@ -98,7 +98,7 @@ supported content to the Kodi media center.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0mz1k5ghyc25v51md02qx7chrbg4cxagvqi18bcbs4agq8ix6sp7"))))
|
||||
"1yacqpf9z8lprwsj194bhlp2ba9ywzbagd6lwxj3h6g405s7zp2k"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("xpi" "firefox" "chromium"))
|
||||
(properties '((addon-id . "uBlock0@raymondhill.net")))
|
||||
|
||||
@ -17904,6 +17904,28 @@ variables, and files, in either version 3 or 4 format, and manipulate existing
|
||||
netCDF files.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public r-ncmisc
|
||||
(package
|
||||
(name "r-ncmisc")
|
||||
(version "1.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "NCmisc" version))
|
||||
(sha256
|
||||
(base32 "10wzznqa26fxyj6bl979qmq29p3dkr8yap4s70l3mwhhk33zpz16"))))
|
||||
(properties `((upstream-name . "NCmisc")))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://cran.r-project.org/package=NCmisc")
|
||||
(synopsis "Functions for creating adaptive functions and scripts")
|
||||
(description
|
||||
"This package provides a set of handy functions. It includes a versatile
|
||||
one line progress bar, one line function timer with detailed output, time delay
|
||||
function, text histogram, object preview, CRAN package search, simpler package
|
||||
installer, Linux command install check, a flexible Mode function, top function,
|
||||
simulation of correlated data, and more.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public r-biocmanager
|
||||
(package
|
||||
(name "r-biocmanager")
|
||||
|
||||
294
gnu/packages/elixir-xyz.scm
Normal file
294
gnu/packages/elixir-xyz.scm
Normal file
@ -0,0 +1,294 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2023 Pierre-Henry Fröhring <phfrohring@deeplinks.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages elixir-xyz)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (gnu packages elixir)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system mix)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-26))
|
||||
|
||||
(define-public elixir-nimble-parsec
|
||||
(package
|
||||
(name "elixir-nimble-parsec")
|
||||
(version "1.3.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (hexpm-uri name version))
|
||||
(sha256
|
||||
(base32 "0rxiw6jzz77v0j460wmzcprhdgn71g1hrz3mcc6djn7bnb0f70i6"))))
|
||||
(build-system mix-build-system)
|
||||
(arguments (list #:tests? #f)) ; no tests
|
||||
(synopsis "Text-based parser combinators")
|
||||
(description
|
||||
"This library provides primitives for efficient parser combinators, allowing
|
||||
for higher-level combinators through composition.")
|
||||
(home-page "https://hexdocs.pm/nimble_parsec/")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public elixir-makeup
|
||||
(package
|
||||
(name "elixir-makeup")
|
||||
(version "1.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (hexpm-uri name version))
|
||||
(sha256
|
||||
(base32 "19jpprryixi452jwhws3bbks6ki3wni9kgzah3srg22a3x8fsi8a"))))
|
||||
(build-system mix-build-system)
|
||||
(propagated-inputs (list elixir-nimble-parsec))
|
||||
(arguments (list #:tests? #f)) ; no tests
|
||||
(synopsis "Syntax highlighter for source code")
|
||||
(description
|
||||
"Makeup is a generic syntax highlighter in the style of Pygments suitable for use in code hosting,
|
||||
forums, wikis or other applications that need to prettify source code.")
|
||||
(home-page "https://hexdocs.pm/makeup/")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public elixir-jason
|
||||
(package
|
||||
(name "elixir-jason")
|
||||
(version "1.4.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (hexpm-uri name version))
|
||||
(sha256
|
||||
(base32 "18d70i31bz11nr6vgsjn5prvhkvwqbyf3xq22ck5cnsnzp6ixc7v"))))
|
||||
(build-system mix-build-system)
|
||||
(arguments (list #:tests? #f)) ; no tests
|
||||
(synopsis "JSON parser and generator")
|
||||
(description
|
||||
"Parser and generator are written in pure Elixir and optimized for speed. They
|
||||
are at least twice as fast as other Elixir/Erlang libraries (e.g.
|
||||
Poison). The performance is comparable to jiffy, which is implemented in C as
|
||||
a NIF.")
|
||||
(home-page "https://hexdocs.pm/jason/")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public elixir-file-system
|
||||
(package
|
||||
(name "elixir-file-system")
|
||||
(version "0.2.10")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (hexpm-uri name version))
|
||||
(sha256
|
||||
(base32 "1p0myxmnjjds8bbg69dd6fvhk8q3n7lb78zd4qvmjajnzgdmw6a1"))
|
||||
(snippet #~(begin
|
||||
(use-modules (guix build utils) (ice-9 ftw))
|
||||
(mkdir "source")
|
||||
(for-each (lambda (file)
|
||||
(when (not (member file '("." ".." "source")))
|
||||
(rename-file file (string-append "source/" file))))
|
||||
(scandir "."))
|
||||
(with-directory-excursion "source"
|
||||
(invoke (string-append #+gzip "/bin/gunzip") "-v" "contents.tar.gz")
|
||||
(invoke (string-append #+tar "/bin/tar") "-xvf" "contents.tar")
|
||||
(delete-file "contents.tar")
|
||||
(delete-file "priv/inotifywait.exe"))))))
|
||||
(build-system mix-build-system)
|
||||
(propagated-inputs (list inotify-tools))
|
||||
(arguments (list #:tests? #f)) ; no tests
|
||||
(synopsis "File system change watcher")
|
||||
(description "Provides a file system change watcher wrapper based on
|
||||
https://github.com/synrc/fs.")
|
||||
(home-page "https://hexdocs.pm/file_system/")
|
||||
(license license:wtfpl2)))
|
||||
|
||||
(define-public elixir-bunt
|
||||
(package
|
||||
(name "elixir-bunt")
|
||||
(version "0.2.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (hexpm-uri name version))
|
||||
(sha256
|
||||
(base32 "19bp6xh052ql3ha0v3r8999cvja5d2p6cph02mxphfaj4jsbyc53"))))
|
||||
(build-system mix-build-system)
|
||||
(arguments (list #:tests? #f)) ; no tests
|
||||
(synopsis "256 color ANSI coloring in the terminal")
|
||||
(description "Bunt is an Elixir package that enables 256 color ANSI
|
||||
coloring in the terminal and allows users to alias colors to more semantic and
|
||||
application-specific names1.")
|
||||
(home-page "https://hexdocs.pm/bunt/")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public elixir-inch-ex
|
||||
(package
|
||||
(name "elixir-inch-ex")
|
||||
(version "2.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (hexpm-uri name version))
|
||||
(sha256
|
||||
(base32 "1a4rjcy3hn5pc40si1d1y7qg0b0mnxx6pw825la67ky8r9gfrl4n"))))
|
||||
(build-system mix-build-system)
|
||||
(arguments (list #:tests? #f)) ; no tests
|
||||
(propagated-inputs (list elixir-bunt elixir-jason))
|
||||
(synopsis
|
||||
"Suggest enhancements for inline documentation")
|
||||
(description
|
||||
"This package provides a Mix task that gives you hints where to improve your
|
||||
inline docs.")
|
||||
(home-page "https://hex.pm/packages/inch_ex")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public elixir-castore
|
||||
(package
|
||||
(name "elixir-castore")
|
||||
(version "1.0.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (hexpm-uri name version))
|
||||
(sha256
|
||||
(base32 "1y44amb8falsmrfzpkmf7qp6215g9kdl76g91dpna4af2jwc264l"))))
|
||||
(build-system mix-build-system)
|
||||
(arguments (list #:tests? #f)) ; no tests
|
||||
(synopsis "Up-to-date CA certificate store")
|
||||
(description "The Elixir castore package is a micro-library that provides
|
||||
an up-to-date CA certificate store file for Elixir applications.")
|
||||
(home-page "https://hexdocs.pm/castore/")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public elixir-excoveralls
|
||||
(package
|
||||
(name "elixir-excoveralls")
|
||||
(version "0.18.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (hexpm-uri name version))
|
||||
(sha256
|
||||
(base32 "02x69ll5scvraky0k5gacvnnmldv5k04kgk02x087d9w3y8vn28i"))))
|
||||
(build-system mix-build-system)
|
||||
(propagated-inputs (list elixir-castore elixir-jason))
|
||||
(arguments (list #:tests? #f)) ; no tests
|
||||
(synopsis "Coverage report tool with coveralls.io integration")
|
||||
(description
|
||||
"Library that reports test coverage statistics, with the option to
|
||||
post to coveralls.io service. It uses Erlang's cover to generate coverage
|
||||
information, and posts the test coverage results to coveralls.io through the
|
||||
JSON API.")
|
||||
(home-page "https://hexdocs.pm/excoveralls/")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public elixir-credo
|
||||
(package
|
||||
(name "elixir-credo")
|
||||
(version "1.7.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (hexpm-uri name version))
|
||||
(sha256
|
||||
(base32 "18jqi9s9r1587njzdxycvmmbma30cay9iamni4f3ih54jmh1r1z9"))))
|
||||
(build-system mix-build-system)
|
||||
(arguments (list #:tests? #f)) ; no tests
|
||||
(propagated-inputs (list elixir-bunt elixir-file-system elixir-jason))
|
||||
(native-inputs (list elixir-excoveralls elixir-inch-ex))
|
||||
(synopsis "Static code analysis tool")
|
||||
(description
|
||||
"Credo is a static code analysis tool for the Elixir language with a focus on
|
||||
teaching and code consistency. Credo can show you refactoring opportunities in
|
||||
your code, complex code fragments, warn you about common mistakes, show
|
||||
inconsistencies in your naming scheme and - if needed - help you enforce a
|
||||
desired coding style.")
|
||||
(home-page "https://hexdocs.pm/credo/")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public elixir-erlex
|
||||
(package
|
||||
(name "elixir-erlex")
|
||||
(version "0.2.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (hexpm-uri name version))
|
||||
(sha256
|
||||
(base32 "0x8c1j62y748ldvlh46sxzv5514rpzm809vxn594vd7y25by5lif"))))
|
||||
(build-system mix-build-system)
|
||||
(arguments (list #:tests? #f)) ; no tests
|
||||
(synopsis
|
||||
"Convert Erlang style structs and error messages to equivalent Elixir")
|
||||
(description
|
||||
"Converted structs and error messages are useful for pretty printing
|
||||
things like Dialyzer errors and Observer.")
|
||||
(home-page "https://hexdocs.pm/erlex/")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public elixir-dialyxir
|
||||
(package
|
||||
(name "elixir-dialyxir")
|
||||
(version "1.4.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (hexpm-uri name version))
|
||||
(sha256
|
||||
(base32 "00cqwhd1wabwds44jz94rvvr8z8cp12884d3lp69fqkrszb9bdw4"))))
|
||||
(build-system mix-build-system)
|
||||
(arguments (list #:tests? #f)) ; no tests
|
||||
(propagated-inputs (list elixir-erlex))
|
||||
(synopsis "Mix tasks to simplify use of Dialyzer")
|
||||
(description
|
||||
"Mix Tasks are usable from the directory of the mix project you want to analyze.")
|
||||
(home-page "https://hexdocs.pm/dialyxir/")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public elixir-machete
|
||||
(package
|
||||
(name "elixir-machete")
|
||||
(version "0.2.8")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (hexpm-uri name version))
|
||||
(sha256
|
||||
(base32 "0952603bmqsf6v3ja99zpbnbx5d52i4xksjkfj3irl45ccq5pgq9"))))
|
||||
(build-system mix-build-system)
|
||||
(native-inputs (list elixir-credo elixir-dialyxir))
|
||||
(synopsis "Literate test matchers for ExUnit")
|
||||
(description
|
||||
"Machete provides ergonomic match operators that act as building blocks to let
|
||||
you define test expectations that can match data against any combination of
|
||||
literals, variables, or parametrically defined matchers.")
|
||||
(home-page "https://hexdocs.pm/machete/")
|
||||
(license license:expat)))
|
||||
|
||||
;;;
|
||||
;;; Avoid adding new packages to the end of this file. To reduce the chances
|
||||
;;; of a merge conflict, place them above by existing packages with similar
|
||||
;;; functionality or similar names.
|
||||
;;;
|
||||
@ -27,6 +27,7 @@
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (gnu packages)
|
||||
@ -96,9 +97,20 @@
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; Some tests require access to a home directory.
|
||||
(setenv "HOME" "/tmp")))
|
||||
(delete 'configure))))
|
||||
(inputs
|
||||
(list erlang git))
|
||||
(delete 'configure)
|
||||
(add-after 'install 'wrap-programs
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(programs '("elixir" "elixirc" "iex" "mix")))
|
||||
(for-each (lambda (program)
|
||||
(wrap-program (string-append out "/bin/" program)
|
||||
'("ERL_LIBS" prefix ("${GUIX_ELIXIR_LIBS}"))))
|
||||
programs)))))))
|
||||
(inputs (list erlang git))
|
||||
(native-search-paths
|
||||
(list (search-path-specification
|
||||
(variable "GUIX_ELIXIR_LIBS")
|
||||
(files (list (string-append "lib/elixir/" (version-major+minor version)))))))
|
||||
(home-page "https://elixir-lang.org/")
|
||||
(synopsis "Elixir programming language")
|
||||
(description "Elixir is a dynamic, functional language used to build
|
||||
@ -106,3 +118,48 @@ scalable and maintainable applications. Elixir leverages the Erlang VM, known
|
||||
for running low-latency, distributed and fault-tolerant systems, while also
|
||||
being successfully used in web development and the embedded software domain.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public elixir-hex
|
||||
(package
|
||||
(name "elixir-hex")
|
||||
(version "2.0.5")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/hexpm/hex.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1kvczwvij58kgkhak68004ap81pl26600bczg21mymy2sypkgxmj"))))
|
||||
;; The mix-build-system assumes that Hex exists.
|
||||
;; We build Hex using the gnu-build-system.
|
||||
;; Other Elixir packages use the mix-build-system.
|
||||
(build-system gnu-build-system)
|
||||
(inputs (list elixir))
|
||||
(arguments
|
||||
(list
|
||||
;; Hex is needed to build packages used to test Hex.
|
||||
;; To avoid this circularity, we disable tests.
|
||||
#:tests? #f
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'bootstrap)
|
||||
(delete 'configure)
|
||||
(replace 'build
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(setenv "MIX_ENV" "prod")
|
||||
(invoke "mix" "compile")))
|
||||
(replace 'install
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(define X.Y #$(version-major+minor (package-version elixir)))
|
||||
(define out (string-append (assoc-ref outputs "out") "/lib/elixir/" X.Y "/hex"))
|
||||
(mkdir-p out)
|
||||
(copy-recursively "_build/prod/lib/hex" out))))))
|
||||
(synopsis "Package manager for the Erlang VM")
|
||||
(description
|
||||
"This project provides tasks that integrate with Mix, Elixir's build
|
||||
tool.")
|
||||
(home-page "https://hexdocs.pm/makeup_elixir/")
|
||||
(license license:bsd-2)))
|
||||
|
||||
@ -11691,7 +11691,7 @@ them easier to distinguish from other, less important buffers.")
|
||||
(define-public emacs-embark
|
||||
(package
|
||||
(name "emacs-embark")
|
||||
(version "0.23")
|
||||
(version "1.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -11699,7 +11699,7 @@ them easier to distinguish from other, less important buffers.")
|
||||
(url "https://github.com/oantolin/embark")
|
||||
(commit version)))
|
||||
(sha256
|
||||
(base32 "1dmsaw1m819kzmai45c4cqh5lyyha451f7dxzwwfz9crmzg2w5sf"))
|
||||
(base32 "14alpanynww6z7yxxyiiy24c0p4pq1argsb0pmqavq25mdxgn4v2"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
@ -24433,8 +24433,8 @@ key again.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-mbsync
|
||||
(let ((commit "b62491c0e0d89eb9c66261a16d7ac81231c9c453")
|
||||
(revision "4"))
|
||||
(let ((commit "d3c81da81ce5b154c0d048047a47277338721a70")
|
||||
(revision "5"))
|
||||
(package
|
||||
(name "emacs-mbsync")
|
||||
(version (git-version "0.1.2" revision commit))
|
||||
@ -24447,7 +24447,7 @@ key again.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1zlih37mkqjn2czl12zn7lgxxljvrwhqqpbksj9c91zn0f0rm3mz"))))
|
||||
"10xxgvzjb7bl3lzgjkdsnnkd9wphkc2pm621agyjlayzcjnldz5p"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/dimitri/mbsync-el")
|
||||
(synopsis "Interface to mbsync for Emacs")
|
||||
|
||||
@ -1365,7 +1365,7 @@ with the included @command{xfstests-check} helper.")
|
||||
(define-public zfs
|
||||
(package
|
||||
(name "zfs")
|
||||
(version "2.1.12")
|
||||
(version "2.1.14")
|
||||
(outputs '("out" "module" "src"))
|
||||
(source
|
||||
(origin
|
||||
@ -1374,7 +1374,7 @@ with the included @command{xfstests-check} helper.")
|
||||
"/download/zfs-" version
|
||||
"/zfs-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0vbf9kfryprb2mbb65jllf6xpsy44xskshglyqqwj4iyxmma5nk4"))))
|
||||
(base32 "0gzansmin40llxxh2zkgpdyp41ikd8s5hv5mpwhpcivk1q8fv7sh"))))
|
||||
(build-system linux-module-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
||||
@ -142,7 +142,7 @@
|
||||
;; <https://bitcoincore.org/en/lifecycle/#schedule>.
|
||||
(package
|
||||
(name "bitcoin-core")
|
||||
(version "25.1")
|
||||
(version "26.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
@ -150,7 +150,7 @@
|
||||
version "/bitcoin-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1jcq2686x6f1g8xk91h3qfw89v1klw931wbpbcvc5a6zv2cabhmy"))))
|
||||
"18f0rl7nzr64m54d6hmrphg7z39mmj2ix47kv78n5nr8dqkrj7db"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list autoconf
|
||||
|
||||
@ -872,38 +872,28 @@ Executables included are:
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public ovmf
|
||||
(let ((commit "13a50a6fe1dcfa6600c38456ee24e0f9ecf51b5f")
|
||||
(revision "1"))
|
||||
(let ((toolchain-ver "GCC5"))
|
||||
(package
|
||||
(name "ovmf")
|
||||
(version (git-version "20170116" revision commit))
|
||||
(version "202308")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
;; OVMF is part of the edk2 source tree.
|
||||
(url "https://github.com/tianocore/edk2")
|
||||
(commit commit)))
|
||||
(recursive? #t) ;edk2 now uses a lot of submodules
|
||||
(commit (string-append "edk2-stable" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1gy2332kdqk8bjzpcsripx10896rbvgl0ic7r344kmpiwdgm948b"))))
|
||||
"04rnfnaqr2c7ayplj7ib730zp1snw157zx5rmykz5hz1zz2vb20j"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #f ; No check target.
|
||||
#:target #f ; Package produces firmware.
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
;; Hide the default GCC from CPLUS_INCLUDE_PATH to prevent it from
|
||||
;; shadowing the version of GCC provided in native-inputs.
|
||||
(add-after 'set-paths 'hide-implicit-gcc
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((gcc (assoc-ref inputs "gcc")))
|
||||
(setenv "CPLUS_INCLUDE_PATH"
|
||||
(string-join
|
||||
(delete (string-append gcc "/include/c++")
|
||||
(string-split (getenv "CPLUS_INCLUDE_PATH")
|
||||
#\:))
|
||||
":")))))
|
||||
(add-after 'unpack 'patch-source
|
||||
(lambda _
|
||||
(substitute* "edksetup.sh"
|
||||
@ -916,41 +906,62 @@ Executables included are:
|
||||
(bin (string-append tools "/BinWrappers/PosixLike")))
|
||||
(setenv "WORKSPACE" cwd)
|
||||
(setenv "EDK_TOOLS_PATH" tools)
|
||||
(setenv "PYTHON3_ENABLE" "TRUE")
|
||||
(setenv "PYTHON_COMMAND" "python3")
|
||||
(setenv "PATH" (string-append (getenv "PATH") ":" bin))
|
||||
(invoke "bash" "edksetup.sh")
|
||||
(substitute* "Conf/tools_def.txt"
|
||||
;; Guix gcc is compiled without pie
|
||||
;; The -no-pie flag causes the Ia32 build to fail
|
||||
(("-no-pie") ""))
|
||||
(substitute* "Conf/target.txt"
|
||||
(("^TARGET[ ]*=.*$") "TARGET = RELEASE\n")
|
||||
(("^TOOL_CHAIN_TAG[ ]*=.*$")
|
||||
(string-append "TOOL_CHAIN_TAG = " #$toolchain-ver "\n"))
|
||||
(("^TARGET_ARCH[ ]*=.*$")
|
||||
(string-append "TARGET_ARCH = IA32"
|
||||
#$@(if (string=? "x86_64-linux" (%current-system))
|
||||
'(", X64")
|
||||
'())
|
||||
"\n"))
|
||||
(("^MAX_CONCURRENT_THREAD_NUMBER[ ]*=.*$")
|
||||
(format #f "MAX_CONCURRENT_THREAD_NUMBER = ~a~%"
|
||||
(number->string (parallel-job-count)))))
|
||||
;; Build build support.
|
||||
(setenv "BUILD_CC" "gcc")
|
||||
(setenv "CC" "gcc")
|
||||
(invoke "make" "-C" tools))))
|
||||
(replace 'build
|
||||
(lambda _
|
||||
(invoke "build" "-a" "IA32" "-t" "GCC49"
|
||||
(invoke "build" "-a" "IA32" "-t" #$toolchain-ver
|
||||
"-p" "OvmfPkg/OvmfPkgIa32.dsc")))
|
||||
#$@(if (string=? "x86_64-linux" (%current-system))
|
||||
#~((add-after 'build 'build-x64
|
||||
(lambda _
|
||||
(invoke "build" "-a" "X64" "-t" "GCC49"
|
||||
(invoke "build" "-a" "X64" "-t" #$toolchain-ver
|
||||
"-p" "OvmfPkg/OvmfPkgX64.dsc"))))
|
||||
#~())
|
||||
(replace 'install
|
||||
(lambda _
|
||||
(let ((fmw (string-append #$output "/share/firmware")))
|
||||
(mkdir-p fmw)
|
||||
(copy-file "Build/OvmfIa32/RELEASE_GCC49/FV/OVMF.fd"
|
||||
(string-append fmw "/ovmf_ia32.bin"))
|
||||
(for-each
|
||||
(lambda (file)
|
||||
(copy-file (string-append "Build/OvmfIa32/RELEASE_"
|
||||
#$toolchain-ver "/FV/" file ".fd")
|
||||
(string-append fmw "/" (string-downcase file) "_ia32.bin"))
|
||||
#$@(if (string=? "x86_64-linux" (%current-system))
|
||||
'((copy-file "Build/OvmfX64/RELEASE_GCC49/FV/OVMF.fd"
|
||||
(string-append fmw "/ovmf_x64.bin")))
|
||||
'())))))))
|
||||
#~((copy-file (string-append "Build/OvmfX64/RELEASE_"
|
||||
#$toolchain-ver "/FV/" file ".fd")
|
||||
(string-append fmw "/" (string-downcase file) "_x64.bin")))
|
||||
#~()))
|
||||
(list "OVMF"
|
||||
"OVMF_CODE"
|
||||
"OVMF_VARS"))))))))
|
||||
(native-inputs
|
||||
`(("acpica" ,acpica)
|
||||
("gcc@5" ,gcc-5)
|
||||
("nasm" ,nasm)
|
||||
("python-2" ,python-2)
|
||||
("perl" ,perl)
|
||||
("python-3" ,python-3)
|
||||
("util-linux" ,util-linux "lib")))
|
||||
(supported-systems '("x86_64-linux" "i686-linux"))
|
||||
(home-page "https://www.tianocore.org")
|
||||
@ -961,6 +972,7 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.")
|
||||
license:bsd-2 license:bsd-3 license:bsd-4)))))
|
||||
|
||||
(define-public ovmf-aarch64
|
||||
(let ((toolchain-ver "GCC5"))
|
||||
(package
|
||||
(inherit ovmf)
|
||||
(name "ovmf-aarch64")
|
||||
@ -976,23 +988,26 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.")
|
||||
#~(modify-phases #$phases
|
||||
#$@(if (string-prefix? "aarch64" (%current-system))
|
||||
'()
|
||||
'((add-before 'configure 'set-env
|
||||
#~((add-before 'configure 'set-env
|
||||
(lambda _
|
||||
(setenv "GCC49_AARCH64_PREFIX" "aarch64-linux-gnu-")))))
|
||||
(setenv (string-append #$toolchain-ver "_AARCH64_PREFIX")
|
||||
"aarch64-linux-gnu-")))))
|
||||
(replace 'build
|
||||
(lambda _
|
||||
(invoke "build" "-a" "AARCH64" "-t" "GCC49"
|
||||
(invoke "build" "-a" "AARCH64" "-t" #$toolchain-ver
|
||||
"-p" "ArmVirtPkg/ArmVirtQemu.dsc")))
|
||||
(delete 'build-x64)
|
||||
(replace 'install
|
||||
(lambda _
|
||||
(let ((fmw (string-append #$output "/share/firmware")))
|
||||
(mkdir-p fmw)
|
||||
(copy-file "Build/ArmVirtQemu-AARCH64/RELEASE_GCC49/FV/QEMU_EFI.fd"
|
||||
(copy-file (string-append "Build/ArmVirtQemu-AARCH64/RELEASE_"
|
||||
#$toolchain-ver "/FV/QEMU_EFI.fd")
|
||||
(string-append fmw "/ovmf_aarch64.bin")))))))))
|
||||
(supported-systems %supported-systems)))
|
||||
(supported-systems %supported-systems))))
|
||||
|
||||
(define-public ovmf-arm
|
||||
(let ((toolchain-ver "GCC5"))
|
||||
(package
|
||||
(inherit ovmf)
|
||||
(name "ovmf-arm")
|
||||
@ -1008,21 +1023,61 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.")
|
||||
#~(modify-phases #$phases
|
||||
#$@(if (string-prefix? "armhf" (%current-system))
|
||||
'()
|
||||
'((add-before 'configure 'set-env
|
||||
#~((add-before 'configure 'set-env
|
||||
(lambda _
|
||||
(setenv "GCC49_ARM_PREFIX" "arm-linux-gnueabihf-")))))
|
||||
(setenv (string-append #$toolchain-ver "_ARM_PREFIX")
|
||||
"arm-linux-gnueabihf-")))))
|
||||
(replace 'build
|
||||
(lambda _
|
||||
(invoke "build" "-a" "ARM" "-t" "GCC49"
|
||||
(invoke "build" "-a" "ARM" "-t" #$toolchain-ver
|
||||
"-p" "ArmVirtPkg/ArmVirtQemu.dsc")))
|
||||
(delete 'build-x64)
|
||||
(replace 'install
|
||||
(lambda _
|
||||
(let ((fmw (string-append #$output "/share/firmware")))
|
||||
(mkdir-p fmw)
|
||||
(copy-file "Build/ArmVirtQemu-ARM/RELEASE_GCC49/FV/QEMU_EFI.fd"
|
||||
(copy-file (string-append "Build/ArmVirtQemu-ARM/RELEASE_"
|
||||
#$toolchain-ver "/FV/QEMU_EFI.fd")
|
||||
(string-append fmw "/ovmf_arm.bin")))))))))
|
||||
(supported-systems %supported-systems)))
|
||||
(supported-systems %supported-systems))))
|
||||
|
||||
(define-public ovmf-riscv64
|
||||
(let ((toolchain-ver "GCC5"))
|
||||
(package
|
||||
(inherit ovmf)
|
||||
(name "ovmf-riscv64")
|
||||
(native-inputs
|
||||
(append (package-native-inputs ovmf)
|
||||
(if (not (string-prefix? "riscv64" (%current-system)))
|
||||
`(("cross-gcc" ,(cross-gcc "riscv64-linux-gnu"))
|
||||
("cross-binutils" ,(cross-binutils "riscv64-linux-gnu")))
|
||||
'())))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments ovmf)
|
||||
((#:phases phases)
|
||||
#~(modify-phases #$phases
|
||||
#$@(if (string-prefix? "riscv64" (%current-system))
|
||||
'()
|
||||
#~((add-before 'configure 'set-env
|
||||
(lambda _
|
||||
(setenv (string-append #$toolchain-ver "_RISCV64_PREFIX")
|
||||
"riscv64-linux-gnu-")))))
|
||||
(replace 'build
|
||||
(lambda _
|
||||
(invoke "build" "-a" "RISCV64" "-t" #$toolchain-ver
|
||||
"-p" "OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc")))
|
||||
(delete 'build-x64)
|
||||
(replace 'install
|
||||
(lambda _
|
||||
(let ((fmw (string-append #$output "/share/firmware")))
|
||||
(mkdir-p fmw)
|
||||
(copy-file (string-append "Build/RiscVVirtQemu/RELEASE_"
|
||||
#$toolchain-ver "/FV/RISCV_VIRT_CODE.fd")
|
||||
(string-append fmw "/RISCV_VIRT_CODE.fd"))
|
||||
(copy-file (string-append "Build/RiscVVirtQemu/RELEASE_"
|
||||
#$toolchain-ver "/FV/RISCV_VIRT_VARS.fd")
|
||||
(string-append fmw "/RISCV_VIRT_VARS.fd")))))))))
|
||||
(supported-systems %supported-systems))))
|
||||
|
||||
(define* (make-arm-trusted-firmware platform
|
||||
#:key (triplet "aarch64-linux-gnu"))
|
||||
|
||||
@ -2494,7 +2494,7 @@ a different style of marking.")
|
||||
(define-public font-jetbrains-mono
|
||||
(package
|
||||
(name "font-jetbrains-mono")
|
||||
(version "2.242")
|
||||
(version "2.304")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -2502,7 +2502,7 @@ a different style of marking.")
|
||||
(string-append "https://github.com/JetBrains/JetBrainsMono/releases/"
|
||||
"download/v" version "/JetBrainsMono-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "17qs985v38x3rcg3v4av3qynwr4gvixrj50vjzy7zkkny575ncaf"))))
|
||||
(base32 "1gvv5w0vfzndzp8k7g15j5i3yvnpr5z3imrwjs5flq19xp37cqvg"))))
|
||||
(build-system font-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
@ -2524,7 +2524,7 @@ a different style of marking.")
|
||||
"JetBrains Mono is a font family dedicated to developers. JetBrains
|
||||
Mono’s typeface forms are simple and free from unnecessary details. Rendered
|
||||
in small sizes, the text looks crisper.")
|
||||
(license license:asl2.0)))
|
||||
(license license:silofl1.1)))
|
||||
|
||||
(define-public font-juliamono
|
||||
(package
|
||||
|
||||
@ -1341,17 +1341,17 @@ and multimedia programs in the Python language.")
|
||||
|
||||
(define-public python-pygame-sdl2
|
||||
(let ((real-version "2.1.0")
|
||||
(renpy-version "8.1.0"))
|
||||
(renpy-version "8.1.3"))
|
||||
(package
|
||||
(inherit python-pygame)
|
||||
(name "python-pygame-sdl2")
|
||||
(version (string-append real-version "-for-renpy-" renpy-version))
|
||||
(version (string-append real-version "+renpy" renpy-version))
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.renpy.org/dl/" renpy-version
|
||||
"/pygame_sdl2-" version ".tar.gz"))
|
||||
(sha256 (base32 "1qj39jqnv334p4wnxc2v5qxyahp7nkqf9hpdd2sgqcmgaqwnqqmj"))
|
||||
(sha256 (base32 "0qlprs9n3w254ilizqzvr6s01zx72gh7an0bgwxsq4hm22qypdws"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
@ -1392,7 +1392,7 @@ developed mainly for Ren'py.")
|
||||
(define-public python-renpy
|
||||
(package
|
||||
(name "python-renpy")
|
||||
(version "8.1.0")
|
||||
(version "8.1.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -1400,7 +1400,7 @@ developed mainly for Ren'py.")
|
||||
"/renpy-" version "-source.tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"08l7z2vwqxkskj3rs2a0w9ahah28ixq8hy48h30k2dm9g19h450h"))
|
||||
"1g6fz5dxp7yxhgv6q4brzf5hpfqq3l1g3dfv3fsiwwn6mj0b01z2"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
#~(begin
|
||||
|
||||
@ -529,7 +529,7 @@ topology functions.")
|
||||
libsoup
|
||||
libxml2
|
||||
rest-next
|
||||
webkitgtk))
|
||||
webkitgtk-for-gtk3))
|
||||
(synopsis "Graphical map viewer and wayfinding program")
|
||||
(description "GNOME Maps is a graphical map viewer. It uses map data from
|
||||
the OpenStreetMap project. It can provide directions for walking, bicycling,
|
||||
|
||||
@ -1666,7 +1666,7 @@ sharing to the masses.")
|
||||
libmusicbrainz
|
||||
libxml2
|
||||
neon
|
||||
webkitgtk))
|
||||
webkitgtk-for-gtk3))
|
||||
(synopsis "File previewer for the GNOME desktop")
|
||||
(description "Sushi is a DBus-activated service that allows applications
|
||||
to preview files on the GNOME desktop.")
|
||||
@ -3398,7 +3398,7 @@ compiles to GTKBuilder XML.")
|
||||
python-pygobject
|
||||
python-lxml
|
||||
webkitgtk
|
||||
webkitgtk-next))
|
||||
webkitgtk))
|
||||
(native-inputs
|
||||
(list `(,glib "bin")
|
||||
gobject-introspection
|
||||
@ -6175,7 +6175,7 @@ both a traditional UI or a modern UI with a GtkHeaderBar.")
|
||||
pkg-config))
|
||||
(inputs
|
||||
(list amtk
|
||||
webkitgtk))
|
||||
webkitgtk-for-gtk3))
|
||||
(home-page "https://wiki.gnome.org/Apps/Devhelp")
|
||||
(synopsis "API documentation browser for GNOME")
|
||||
(description
|
||||
@ -6188,7 +6188,7 @@ throughout GNOME for API documentation).")
|
||||
(hidden-package
|
||||
(package/inherit devhelp
|
||||
(inputs (modify-inputs (package-inputs devhelp)
|
||||
(replace "webkitgtk" webkitgtk-with-libsoup2))))))
|
||||
(replace "webkitgtk-for-gtk3" webkitgtk-with-libsoup2))))))
|
||||
|
||||
(define-public cogl
|
||||
(package
|
||||
@ -7204,7 +7204,7 @@ almost all of them.")
|
||||
libxslt
|
||||
nettle ; for hogweed
|
||||
sqlite
|
||||
webkitgtk))
|
||||
webkitgtk-for-gtk3))
|
||||
(home-page "https://wiki.gnome.org/Apps/Web")
|
||||
(synopsis "GNOME web browser")
|
||||
(description
|
||||
@ -7394,7 +7394,7 @@ jQuery.Syntax JavaScript libraries.")
|
||||
man-db ;for URIs like "man:ls"
|
||||
groff-minimal ;ditto
|
||||
sqlite
|
||||
webkitgtk
|
||||
webkitgtk-for-gtk3
|
||||
yelp-xsl))
|
||||
(home-page "https://wiki.gnome.org/Apps/Yelp")
|
||||
(synopsis "GNOME help browser")
|
||||
@ -8074,7 +8074,7 @@ window manager.")
|
||||
libsecret
|
||||
mit-krb5
|
||||
rest-next
|
||||
webkitgtk))
|
||||
webkitgtk-for-gtk3))
|
||||
(synopsis "Single sign-on framework for GNOME")
|
||||
(home-page "https://wiki.gnome.org/Projects/GnomeOnlineAccounts")
|
||||
(description
|
||||
@ -8107,7 +8107,7 @@ Microsoft Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
|
||||
(delete 'disable-gtk-update-icon-cache)))))
|
||||
(inputs (modify-inputs (package-inputs gnome-online-accounts)
|
||||
(replace "rest" rest)
|
||||
(replace "webkitgtk" webkitgtk-with-libsoup2)))))
|
||||
(replace "webkitgtk-for-gtk3" webkitgtk-with-libsoup2)))))
|
||||
|
||||
(define-public evolution-data-server
|
||||
(package
|
||||
@ -8193,7 +8193,7 @@ Microsoft Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
|
||||
libphonenumber
|
||||
mit-krb5
|
||||
openldap
|
||||
webkitgtk))
|
||||
webkitgtk-for-gtk3))
|
||||
(synopsis "Store address books and calendars")
|
||||
(home-page "https://wiki.gnome.org/Apps/Evolution")
|
||||
(description
|
||||
@ -8220,7 +8220,7 @@ Evolution (hence the name), but is now used by other packages as well.")
|
||||
(modify-inputs (package-inputs evolution-data-server)
|
||||
(replace "gnome-online-accounts" gnome-online-accounts-3.44)
|
||||
(replace "libgweather4" libgweather)
|
||||
(replace "webkitgtk" webkitgtk-with-libsoup2)))
|
||||
(replace "webkitgtk-for-gtk3" webkitgtk-with-libsoup2)))
|
||||
(propagated-inputs
|
||||
(modify-inputs (package-propagated-inputs evolution-data-server)
|
||||
(delete "gtk")
|
||||
@ -11317,7 +11317,7 @@ views can be printed as PDF or PostScript files, or exported to HTML.")
|
||||
python-pygobject
|
||||
python-pylast
|
||||
totem-pl-parser
|
||||
webkitgtk))
|
||||
webkitgtk-for-gtk3))
|
||||
(propagated-inputs
|
||||
(list gst-plugins-good ;required to start lollypop
|
||||
gst-plugins-ugly)) ;required for streaming
|
||||
@ -11786,7 +11786,7 @@ generic enough to work for everyone.")
|
||||
libsoup
|
||||
nss
|
||||
openldap
|
||||
webkitgtk
|
||||
webkitgtk-for-gtk3
|
||||
ytnef))
|
||||
(home-page "https://gitlab.gnome.org/GNOME/evolution")
|
||||
(synopsis "Manage your email, contacts and schedule")
|
||||
@ -12405,7 +12405,7 @@ integrate seamlessly with the GNOME desktop.")
|
||||
spice-gtk
|
||||
tracker
|
||||
vte
|
||||
webkitgtk))
|
||||
webkitgtk-for-gtk3))
|
||||
(home-page "https://wiki.gnome.org/Apps/Boxes")
|
||||
(synopsis "View, access, and manage remote and virtual systems")
|
||||
(description "GNOME Boxes is a simple application to view, access, and
|
||||
@ -12479,7 +12479,7 @@ non-privileged user.")
|
||||
libstemmer
|
||||
libunwind
|
||||
sqlite
|
||||
webkitgtk
|
||||
webkitgtk-for-gtk3
|
||||
ytnef))
|
||||
(native-inputs
|
||||
(list appstream-glib
|
||||
@ -13178,7 +13178,7 @@ profiler via Sysprof, debugging support, and more.")
|
||||
python-rarfile
|
||||
python-requests
|
||||
python-unidecode
|
||||
webkitgtk-next))
|
||||
webkitgtk))
|
||||
(native-inputs
|
||||
(list desktop-file-utils
|
||||
gettext-minimal
|
||||
|
||||
@ -546,9 +546,9 @@ variable defined below. It requires guile-json to be installed."
|
||||
;; XXXX: Workaround 'snippet' limitations.
|
||||
(define computed-origin-method (@@ (guix packages) computed-origin-method))
|
||||
|
||||
(define %icecat-base-version "115.5.0")
|
||||
(define %icecat-base-version "115.6.0")
|
||||
(define %icecat-version (string-append %icecat-base-version "-guix0-preview1"))
|
||||
(define %icecat-build-id "20231121000000") ;must be of the form YYYYMMDDhhmmss
|
||||
(define %icecat-build-id "20231219000000") ;must be of the form YYYYMMDDhhmmss
|
||||
|
||||
;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
|
||||
;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
|
||||
@ -568,12 +568,12 @@ variable defined below. It requires guile-json to be installed."
|
||||
"firefox-" upstream-firefox-version ".source.tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0a578r4kri7jdw8pkkzp7f1mm9idlk7sjxjghcb08k5p14172gyv"))))
|
||||
"0rmw486yhkb1is1j2fy51djl5p5qggf2fhp2hgzfdj4s2bjydmv6"))))
|
||||
|
||||
;; The upstream-icecat-base-version may be older than the
|
||||
;; %icecat-base-version.
|
||||
(upstream-icecat-base-version "115.5.0")
|
||||
(gnuzilla-commit "bd66797f3bb057c9d051d4276d63843b4d7ee854")
|
||||
(upstream-icecat-base-version "115.6.0")
|
||||
(gnuzilla-commit "6a76a10682b6e63f562e4b9f26f3ef12f88bd839")
|
||||
(gnuzilla-source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -585,7 +585,7 @@ variable defined below. It requires guile-json to be installed."
|
||||
(string-take gnuzilla-commit 8)))
|
||||
(sha256
|
||||
(base32
|
||||
"0v3ckm8yv566f2y9a2bfzakbsk529f1ykr7dj69kb9k93dgny3ja"))))
|
||||
"15bvlz7c4d8mk10zc317rai91hd96wnchikcfdfxzl35zdnd315r"))))
|
||||
|
||||
;; 'search-patch' returns either a valid file name or #f, so wrap it
|
||||
;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
|
||||
|
||||
@ -472,7 +472,8 @@ in the style of communicating sequential processes (@dfn{CSP}).")
|
||||
`(("gold" ,binutils-gold)))
|
||||
(_ `()))
|
||||
,@(package-native-inputs go-1.4)))
|
||||
(supported-systems (delete "powerpc-linux" %supported-systems))))
|
||||
(supported-systems (fold delete %supported-systems
|
||||
(list "powerpc-linux" "i586-gnu")))))
|
||||
|
||||
(define-public go-1.16
|
||||
(package
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
|
||||
;;; Copyright © 2017 Nikita <nikita@n0.is>
|
||||
;;; Copyright © 2017, 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2018, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2018, 2019, 2020, 2021, 2022, 2023 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
|
||||
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
|
||||
@ -1106,7 +1106,7 @@ for calling methods on remote servers by exchanging JSON objects.")
|
||||
(define-public guile-ares-rs
|
||||
(package
|
||||
(name "guile-ares-rs")
|
||||
(version "0.9.0")
|
||||
(version "0.9.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -1116,7 +1116,7 @@ for calling methods on remote servers by exchanging JSON objects.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0jl4k54ydi1qxdvif4di0ri5jznlfc2gg1qhs94bhk4y22k0gp8c"))))
|
||||
"173jg8z0cwq5r67lzxsmyir5f6cxd9i5gzb3qryq71cqq4h1c77n"))))
|
||||
(build-system guile-build-system)
|
||||
(arguments
|
||||
(list
|
||||
@ -2278,6 +2278,18 @@ users and in some situations.")
|
||||
(base32
|
||||
"1q1snj8gz2bvqw2v2jvwlzn5xfh7f7wlp922isnzismrp4adc918"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-extension-path
|
||||
(lambda _
|
||||
;; Provide the absolute path of the guile-libudev extension to
|
||||
;; ensure the dlopen call always succeeds.
|
||||
(substitute* (find-files "." "\\.scm")
|
||||
(("load-extension \"libguile-udev\"")
|
||||
(format #f "load-extension \"~a/lib/libguile-udev.so\""
|
||||
#$output))))))))
|
||||
(native-inputs (list autoconf
|
||||
automake
|
||||
gettext-minimal
|
||||
@ -3433,7 +3445,7 @@ list of components. This module takes care of that for you.")
|
||||
(guix build utils)
|
||||
(ice-9 popen)
|
||||
(ice-9 rdelim))
|
||||
#:disallowed-references ,(list gtk+ webkitgtk)
|
||||
#:disallowed-references ,(list gtk+ webkitgtk-for-gtk3)
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'remove-dotted-circle-from-combining-character
|
||||
@ -3479,7 +3491,7 @@ list of components. This module takes care of that for you.")
|
||||
(propagated-inputs (list gobject-introspection))
|
||||
(inputs (list guile-3.0 glib
|
||||
;; For tests, only relevant when compiling natively
|
||||
gtk+ webkitgtk))
|
||||
gtk+ webkitgtk-for-gtk3))
|
||||
(home-page "https://github.com/spk121/guile-gi")
|
||||
(synopsis "GObject bindings for Guile")
|
||||
(description
|
||||
@ -4018,7 +4030,7 @@ processing filters.")
|
||||
("glib-networking" ,glib-networking)
|
||||
("gtk+" ,gtk+)
|
||||
("gtk+:bin" ,gtk+ "bin")
|
||||
("webkitgtk" ,webkitgtk)
|
||||
("webkitgtk" ,webkitgtk-for-gtk3)
|
||||
("gtksourceview" ,gtksourceview-4)
|
||||
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
|
||||
("vte" ,vte)
|
||||
|
||||
@ -21,9 +21,12 @@
|
||||
|
||||
(define-module (gnu packages i2p)
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages upnp)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system cmake)
|
||||
@ -32,7 +35,7 @@
|
||||
(define-public i2pd
|
||||
(package
|
||||
(name "i2pd")
|
||||
(version "2.44.0")
|
||||
(version "2.50.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -41,41 +44,18 @@
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0fwaalfxqdahgvx5rfkvdmf6gl10w328a18ddhyn5kvpmp9x7fgl"))))
|
||||
(base32 "1vr251mgffawi3rj51dzlnv3fs1ssz6gl17qbsyhfr5fcd7s0hc5"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs (list check pkg-config))
|
||||
(inputs
|
||||
(list boost miniupnpc openssl zlib))
|
||||
(arguments
|
||||
'(#:configure-flags
|
||||
(let ((source (assoc-ref %build-inputs "source")))
|
||||
(list (string-append "-S" source "/build")
|
||||
"-DWITH_PCH=OFF"
|
||||
"-DWITH_STATIC=OFF"
|
||||
(list
|
||||
#:configure-flags
|
||||
#~(list (string-append "-S" #$source "/build")
|
||||
"-DWITH_UPNP=ON"
|
||||
"-DWITH_LIBRARY=ON"
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
"-DWITH_BINARY=ON"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda* (#:key
|
||||
tests?
|
||||
(make-flags '())
|
||||
(parallel-tests? #t)
|
||||
#:allow-other-keys)
|
||||
(let ((source (assoc-ref %build-inputs "source")))
|
||||
(when tests?
|
||||
(copy-recursively (string-append source "/tests")
|
||||
"./tests")
|
||||
(with-directory-excursion "tests"
|
||||
(substitute* "Makefile"
|
||||
(("../libi2pd") (string-append source "/libi2pd")))
|
||||
(apply invoke "make" "all"
|
||||
`(,@(if parallel-tests?
|
||||
`("-j" ,(number->string
|
||||
(parallel-job-count)))
|
||||
'())
|
||||
,@make-flags))))))))))
|
||||
"-DBUILD_TESTING=ON")))
|
||||
(home-page "https://i2pd.website/")
|
||||
(synopsis "Router for an end-to-end encrypted and anonymous internet")
|
||||
(description "i2pd is a client for the anonymous I2P network, upon which
|
||||
|
||||
@ -1253,7 +1253,9 @@ supplies a generic doubly-linked list and some string functions.")
|
||||
(patches
|
||||
(append
|
||||
(search-patches "freeimage-unbundle.patch"
|
||||
"freeimage-libtiff-compat.patch")
|
||||
"freeimage-libtiff-compat.patch"
|
||||
"freeimage-CVE-2020-21428.patch"
|
||||
"freeimage-CVE-2020-22524.patch")
|
||||
;; Take one patch from Arch Linux that adds LibRaw 0.20 compatibility.
|
||||
(list (origin
|
||||
(method url-fetch)
|
||||
|
||||
@ -77,6 +77,7 @@
|
||||
;;; Copyright © 2023 dan <i@dan.games>
|
||||
;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com>
|
||||
;;; Copyright © 2023 Wilko Meyer <w@wmeyer.eu>
|
||||
;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -3101,6 +3102,40 @@ Both commands are targeted at system administrators.")
|
||||
'((release-monitoring-url . "https://www.netfilter.org/pub/iptables/")))
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public iptables-nft
|
||||
(package
|
||||
(inherit iptables)
|
||||
(name "iptables-nft")
|
||||
(source #f)
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'unpack)
|
||||
(replace 'install
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(for-each
|
||||
(lambda (command-path)
|
||||
(let ((link-path (string-append #$output command-path)))
|
||||
(mkdir-p (dirname link-path))
|
||||
(symlink (search-input-file inputs "sbin/xtables-nft-multi")
|
||||
link-path)))
|
||||
(apply append
|
||||
'("/bin/iptables-xml")
|
||||
(map (lambda (xtables)
|
||||
(list (string-append "/sbin/" xtables)
|
||||
(string-append "/sbin/" xtables "-restore")
|
||||
(string-append "/sbin/" xtables "-save")))
|
||||
'("arptables"
|
||||
"ebtables"
|
||||
"iptables"
|
||||
"ip6tables")))))))))
|
||||
(inputs (list iptables))
|
||||
(native-inputs '())
|
||||
(synopsis
|
||||
"Programs to configure Linux IP packet filtering rules (nftables API)")))
|
||||
|
||||
(define-public bolt
|
||||
(package
|
||||
(name "bolt")
|
||||
@ -9389,7 +9424,7 @@ of Linux application development.")
|
||||
(define-public wireplumber
|
||||
(package
|
||||
(name "wireplumber")
|
||||
(version "0.4.14")
|
||||
(version "0.4.17")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -9399,7 +9434,7 @@ of Linux application development.")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0jmnd6000j4wx68lxgz5b4g4hxkf243ivi9swaaf8rnx99cbx91w"))))
|
||||
(base32 "00jzn0pxy2ws819yg4p8xxhngqai3labd1alaxb8zwzymr7m06my"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("-Dsystemd=disabled"
|
||||
|
||||
@ -5065,7 +5065,7 @@ is a library for creating graphical user interfaces.")
|
||||
(inputs
|
||||
`(("cffi" ,sbcl-cffi)
|
||||
("cl-cffi-gtk" ,sbcl-cl-cffi-gtk)
|
||||
("webkitgtk" ,webkitgtk)))
|
||||
("webkitgtk" ,webkitgtk-for-gtk3)))
|
||||
(native-inputs
|
||||
`(;; Tests seem to need Xorg.
|
||||
;; ("xorg-server" ,xorg-server-for-tests)
|
||||
|
||||
@ -3931,7 +3931,7 @@ tools and applications:
|
||||
libsecret
|
||||
openldap
|
||||
sqlite
|
||||
webkitgtk))
|
||||
webkitgtk-for-gtk3))
|
||||
(native-inputs
|
||||
(list compface
|
||||
`(,glib "bin") intltool pkg-config yelp-tools))
|
||||
|
||||
@ -775,7 +775,7 @@ infamous 'Wanda the Fish'.")
|
||||
;; Build libkpathsea as a shared library for DVI support.
|
||||
;; ("libkpathsea" ,texlive-bin)
|
||||
("poppler" ,poppler)
|
||||
("webkitgtk" ,webkitgtk)))
|
||||
("webkitgtk" ,webkitgtk-for-gtk3)))
|
||||
(home-page "https://mate-desktop.org")
|
||||
(synopsis "Document viewer for Mate")
|
||||
(description
|
||||
|
||||
@ -578,7 +578,7 @@ list(APPEND ctrlrLibs \"iberty\")")))))
|
||||
freetype
|
||||
libiberty
|
||||
libx11
|
||||
webkitgtk))
|
||||
webkitgtk-for-gtk3))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(home-page "https://ctrlr.org/")
|
||||
|
||||
@ -4195,7 +4195,7 @@ network. This must be enabled on the target host, usually in the BIOS.")
|
||||
(define-public traceroute
|
||||
(package
|
||||
(name "traceroute")
|
||||
(version "2.1.2")
|
||||
(version "2.1.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -4203,7 +4203,7 @@ network. This must be enabled on the target host, usually in the BIOS.")
|
||||
"traceroute-" version "/traceroute-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "07svkglyizxirgcmv6d4ih59f3ds8pnyprvkrqcf5d3p567jcz2h"))))
|
||||
(base32 "17l5barragw0mfgsbjfndny3w4l7zs20l6s6rvim3azajq6jcv4w"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
||||
17
gnu/packages/patches/freeimage-CVE-2020-21428.patch
Normal file
17
gnu/packages/patches/freeimage-CVE-2020-21428.patch
Normal file
@ -0,0 +1,17 @@
|
||||
https://sources.debian.org/data/main/f/freeimage/3.18.0%2Bds2-10/debian/patches/r1877-improved-DDS-plugin-against-malicious-images.patch
|
||||
|
||||
Origin: upstream, r1877
|
||||
Index: Source/FreeImage/PluginDDS.cpp
|
||||
===================================================================
|
||||
diff --git a/Source/FreeImage/PluginDDS.cpp b/Source/FreeImage/PluginDDS.cpp
|
||||
--- a/Source/FreeImage/PluginDDS.cpp (revision 1876)
|
||||
+++ b/Source/FreeImage/PluginDDS.cpp (revision 1877)
|
||||
@@ -617,7 +617,7 @@
|
||||
// read the file
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
- const int line = CalculateLine(width, bpp);
|
||||
+ const int line = CalculateLine(width, FreeImage_GetBPP(dib));
|
||||
const int filePitch = ((desc->dwFlags & DDSD_PITCH) == DDSD_PITCH) ? (int)desc->dwPitchOrLinearSize : line;
|
||||
const long delta = (long)filePitch - (long)line;
|
||||
|
||||
229
gnu/packages/patches/freeimage-CVE-2020-22524.patch
Normal file
229
gnu/packages/patches/freeimage-CVE-2020-22524.patch
Normal file
@ -0,0 +1,229 @@
|
||||
https://sources.debian.org/data/main/f/freeimage/3.18.0%2Bds2-10/debian/patches/r1848-improved-PFM-plugin-against-malicious-images.patch
|
||||
|
||||
Origin: upstream, r1848
|
||||
Index: Source/FreeImage/PluginPFM.cpp
|
||||
---
|
||||
diff --git a/Source/FreeImage/PluginPFM.cpp b/Source/FreeImage/PluginPFM.cpp
|
||||
--- a/Source/FreeImage/PluginPFM.cpp (revision 1847)
|
||||
+++ b/Source/FreeImage/PluginPFM.cpp (revision 1848)
|
||||
@@ -23,6 +23,12 @@
|
||||
#include "Utilities.h"
|
||||
|
||||
// ==========================================================
|
||||
+// Plugin Interface
|
||||
+// ==========================================================
|
||||
+
|
||||
+static int s_format_id;
|
||||
+
|
||||
+// ==========================================================
|
||||
// Internal functions
|
||||
// ==========================================================
|
||||
|
||||
@@ -59,6 +65,9 @@
|
||||
|
||||
/**
|
||||
Get an integer value from the actual position pointed by handle
|
||||
+@param io
|
||||
+@param handle
|
||||
+@return Returns -1 in case of failure, returns the found number otherwise
|
||||
*/
|
||||
static int
|
||||
pfm_get_int(FreeImageIO *io, fi_handle handle) {
|
||||
@@ -65,70 +74,72 @@
|
||||
char c = 0;
|
||||
BOOL bFirstChar;
|
||||
|
||||
- // skip forward to start of next number
|
||||
+ try {
|
||||
|
||||
- if(!io->read_proc(&c, 1, 1, handle)) {
|
||||
- throw FI_MSG_ERROR_PARSING;
|
||||
- }
|
||||
+ // skip forward to start of next number
|
||||
|
||||
- while (1) {
|
||||
- // eat comments
|
||||
+ if (io->read_proc(&c, 1, 1, handle) != 1) {
|
||||
+ throw FI_MSG_ERROR_PARSING;
|
||||
+ }
|
||||
|
||||
- if (c == '#') {
|
||||
- // if we're at a comment, read to end of line
|
||||
+ while (1) {
|
||||
+ // eat comments
|
||||
|
||||
- bFirstChar = TRUE;
|
||||
+ if (c == '#') {
|
||||
+ // if we're at a comment, read to end of line
|
||||
|
||||
- while (1) {
|
||||
- if(!io->read_proc(&c, 1, 1, handle)) {
|
||||
- throw FI_MSG_ERROR_PARSING;
|
||||
- }
|
||||
+ bFirstChar = TRUE;
|
||||
|
||||
- if (bFirstChar && c == ' ') {
|
||||
- // loop off 1 sp after #
|
||||
- bFirstChar = FALSE;
|
||||
- } else if (c == '\n') {
|
||||
- break;
|
||||
+ while (1) {
|
||||
+ if (io->read_proc(&c, 1, 1, handle) != 1) {
|
||||
+ throw FI_MSG_ERROR_PARSING;
|
||||
+ }
|
||||
+
|
||||
+ if (bFirstChar && c == ' ') {
|
||||
+ // loop off 1 sp after #
|
||||
+ bFirstChar = FALSE;
|
||||
+ }
|
||||
+ else if (c == '\n') {
|
||||
+ break;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
- }
|
||||
|
||||
- if (c >= '0' && c <='9') {
|
||||
- // we've found what we were looking for
|
||||
- break;
|
||||
- }
|
||||
+ if (c >= '0' && c <= '9') {
|
||||
+ // we've found what we were looking for
|
||||
+ break;
|
||||
+ }
|
||||
|
||||
- if(!io->read_proc(&c, 1, 1, handle)) {
|
||||
- throw FI_MSG_ERROR_PARSING;
|
||||
+ if (io->read_proc(&c, 1, 1, handle) != 1) {
|
||||
+ throw FI_MSG_ERROR_PARSING;
|
||||
+ }
|
||||
}
|
||||
- }
|
||||
|
||||
- // we're at the start of a number, continue until we hit a non-number
|
||||
+ // we're at the start of a number, continue until we hit a non-number
|
||||
|
||||
- int i = 0;
|
||||
+ int i = 0;
|
||||
|
||||
- while (1) {
|
||||
- i = (i * 10) + (c - '0');
|
||||
+ while (1) {
|
||||
+ i = (i * 10) + (c - '0');
|
||||
|
||||
- if(!io->read_proc(&c, 1, 1, handle)) {
|
||||
- throw FI_MSG_ERROR_PARSING;
|
||||
- }
|
||||
+ if (io->read_proc(&c, 1, 1, handle) != 1) {
|
||||
+ throw FI_MSG_ERROR_PARSING;
|
||||
+ }
|
||||
|
||||
- if (c < '0' || c > '9') {
|
||||
- break;
|
||||
+ if (c < '0' || c > '9') {
|
||||
+ break;
|
||||
+ }
|
||||
}
|
||||
- }
|
||||
|
||||
- return i;
|
||||
+ return i;
|
||||
+ }
|
||||
+ catch (const char *message) {
|
||||
+ FreeImage_OutputMessageProc(s_format_id, message);
|
||||
+ return -1;
|
||||
+ }
|
||||
}
|
||||
|
||||
// ==========================================================
|
||||
-// Plugin Interface
|
||||
-// ==========================================================
|
||||
-
|
||||
-static int s_format_id;
|
||||
-
|
||||
-// ==========================================================
|
||||
// Plugin Implementation
|
||||
// ==========================================================
|
||||
|
||||
@@ -230,8 +241,12 @@
|
||||
}
|
||||
|
||||
// Read the header information: width, height and the scale value
|
||||
- unsigned width = (unsigned) pfm_get_int(io, handle);
|
||||
- unsigned height = (unsigned) pfm_get_int(io, handle);
|
||||
+ int width = pfm_get_int(io, handle);
|
||||
+ int height = pfm_get_int(io, handle);
|
||||
+ if ((width <= 0) || (height <= 0)) {
|
||||
+ throw FI_MSG_ERROR_PARSING;
|
||||
+ }
|
||||
+
|
||||
float scalefactor = 1;
|
||||
|
||||
BOOL bResult = pfm_get_line(io, handle, line_buffer, PFM_MAXLINE);
|
||||
@@ -262,7 +277,7 @@
|
||||
throw FI_MSG_ERROR_MEMORY;
|
||||
}
|
||||
|
||||
- for (unsigned y = 0; y < height; y++) {
|
||||
+ for (int y = 0; y < height; y++) {
|
||||
FIRGBF *bits = (FIRGBF*)FreeImage_GetScanLine(dib, height - 1 - y);
|
||||
|
||||
if(io->read_proc(lineBuffer, sizeof(float), lineWidth, handle) != lineWidth) {
|
||||
@@ -271,7 +286,7 @@
|
||||
float *channel = lineBuffer;
|
||||
if(scalefactor > 0) {
|
||||
// MSB
|
||||
- for (unsigned x = 0; x < width; x++) {
|
||||
+ for (int x = 0; x < width; x++) {
|
||||
REVERSEBYTES(channel++, &bits[x].red);
|
||||
REVERSEBYTES(channel++, &bits[x].green);
|
||||
REVERSEBYTES(channel++, &bits[x].blue);
|
||||
@@ -278,7 +293,7 @@
|
||||
}
|
||||
} else {
|
||||
// LSB
|
||||
- for (unsigned x = 0; x < width; x++) {
|
||||
+ for (int x = 0; x < width; x++) {
|
||||
bits[x].red = *channel++;
|
||||
bits[x].green = *channel++;
|
||||
bits[x].blue = *channel++;
|
||||
@@ -296,7 +311,7 @@
|
||||
throw FI_MSG_ERROR_MEMORY;
|
||||
}
|
||||
|
||||
- for (unsigned y = 0; y < height; y++) {
|
||||
+ for (int y = 0; y < height; y++) {
|
||||
float *bits = (float*)FreeImage_GetScanLine(dib, height - 1 - y);
|
||||
|
||||
if(io->read_proc(lineBuffer, sizeof(float), lineWidth, handle) != lineWidth) {
|
||||
@@ -305,12 +320,12 @@
|
||||
float *channel = lineBuffer;
|
||||
if(scalefactor > 0) {
|
||||
// MSB - File is Big endian
|
||||
- for (unsigned x = 0; x < width; x++) {
|
||||
+ for (int x = 0; x < width; x++) {
|
||||
REVERSEBYTES(channel++, &bits[x]);
|
||||
}
|
||||
} else {
|
||||
// LSB - File is Little Endian
|
||||
- for (unsigned x = 0; x < width; x++) {
|
||||
+ for (int x = 0; x < width; x++) {
|
||||
bits[x] = *channel++;
|
||||
}
|
||||
}
|
||||
@@ -323,9 +338,12 @@
|
||||
return dib;
|
||||
|
||||
} catch (const char *text) {
|
||||
- if(lineBuffer) free(lineBuffer);
|
||||
- if(dib) FreeImage_Unload(dib);
|
||||
-
|
||||
+ if (lineBuffer) {
|
||||
+ free(lineBuffer);
|
||||
+ }
|
||||
+ if (dib) {
|
||||
+ FreeImage_Unload(dib);
|
||||
+ }
|
||||
if(NULL != text) {
|
||||
FreeImage_OutputMessageProc(s_format_id, text);
|
||||
}
|
||||
50
gnu/packages/php-xyz.scm
Normal file
50
gnu/packages/php-xyz.scm
Normal file
@ -0,0 +1,50 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages php-xyz)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages php)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system copy)
|
||||
#:use-module (guix utils)
|
||||
#:use-module ((guix licenses) #:prefix license:))
|
||||
|
||||
(define-public composer-classloader
|
||||
(package
|
||||
(name "composer-classloader")
|
||||
(version "1.9.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/composer/composer")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0127zmmg3yx84ljngfs86q7kjhyypybkf4d1ihfrfnzgynzxfxdf"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
`(#:install-plan
|
||||
'(("src/Composer/Autoload/ClassLoader.php" "/share/web/composer/"))))
|
||||
(home-page "https://getcomposer.org")
|
||||
(synopsis "PHP class loader extracted from the composer package")
|
||||
(description "This package contains the class loader class used by Composer to
|
||||
build its autoloading feature. This package is used by the composer-build-system
|
||||
to build its own store-aware autoloading feature.")
|
||||
(license license:expat)))
|
||||
@ -71,7 +71,8 @@
|
||||
`("LD_LIBRARY_PATH" ":" prefix (,webkitgtk-path)))
|
||||
#t))))))
|
||||
(inputs
|
||||
(list gtk+ gtksourceview-3 python-pyyaml python-pygobject webkitgtk))
|
||||
(list gtk+ gtksourceview-3 python-pyyaml python-pygobject
|
||||
webkitgtk-for-gtk3))
|
||||
;; TODO: package the following for python3 (if possible), add them as
|
||||
;; dependencies, and remove them from rednotebook source:
|
||||
;; pygtkspellcheck, elib.intl, msgfmt, txt2tags
|
||||
|
||||
@ -132,7 +132,7 @@ file names.
|
||||
(define-public libssh
|
||||
(package
|
||||
(name "libssh")
|
||||
(version "0.10.5")
|
||||
(version "0.10.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.libssh.org/files/"
|
||||
@ -140,7 +140,7 @@ file names.
|
||||
"/libssh-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0d22gq77ga24ijlgr3d1wvhfvprx61iklkb3npifxfb7ygvjy3mn"))
|
||||
"1hcxvsb4brznxqq6cjwxkk7yv4c48w4fcwxwd8dp9wdnyncd8q8q"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; 'PATH_MAX' is undefined on GNU/Hurd; work around it.
|
||||
@ -198,7 +198,7 @@ a server that supports the SSH-2 protocol.")
|
||||
(define-public openssh
|
||||
(package
|
||||
(name "openssh")
|
||||
(version "9.5p1")
|
||||
(version "9.6p1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -206,11 +206,14 @@ a server that supports the SSH-2 protocol.")
|
||||
"openssh-" version ".tar.gz"))
|
||||
(patches (search-patches "openssh-trust-guix-store-directory.patch"))
|
||||
(sha256
|
||||
(base32 "0sq8hqk6f0x6djgvqawjbwwxpwd8r1nzjahqfl7m9yx7kfvyf9ph"))))
|
||||
(base32 "0z3pgam8b4z05lvdb78iv06p204qwl7b94a3cnnwba2mfb0120li"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:test-target "tests"
|
||||
;; Not all of the tests can be run in parallel, see
|
||||
;; <https://marc.info/?l=openssh-unix-dev&m=170313565518842>.
|
||||
#:parallel-tests? #f
|
||||
;; Otherwise, the test scripts try to use a nonexistent directory and fail.
|
||||
#:make-flags
|
||||
#~(list "REGRESSTMP=\"$${BUILDDIR}/regress\"")
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
|
||||
;;; Copyright © 2023 Benjamin Slade <slade@lambda-y.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -44,7 +45,7 @@
|
||||
(define-public syncthing
|
||||
(package
|
||||
(name "syncthing")
|
||||
(version "1.25.0")
|
||||
(version "1.27.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/syncthing/syncthing"
|
||||
@ -52,7 +53,7 @@
|
||||
"/syncthing-source-v" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"18cyg0wnf34xi964fxvzxgcq6z0pbirk0k4z82w1cqi3f3l9jlg2"))))
|
||||
"0d1qlzh07a9h2wx2fxm2fdask2sm750pqwk7jx62x2hcwmb08ysw"))))
|
||||
(build-system go-build-system)
|
||||
;; The primary Syncthing executable goes to "out", while the auxiliary
|
||||
;; server programs and utility tools go to "utils". This reduces the size
|
||||
|
||||
@ -43,7 +43,6 @@
|
||||
#:use-module (gnu packages cmake)
|
||||
#:use-module (gnu packages crates-io)
|
||||
#:use-module (gnu packages curl)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages glib)
|
||||
@ -336,38 +335,6 @@ file system, and many more features.")
|
||||
(license (list license:gpl2+ ; filter/*
|
||||
license:expat)))) ; everything else
|
||||
|
||||
(define-public newsboat-2.13
|
||||
(package
|
||||
(inherit newsboat)
|
||||
(version "2.13")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://newsboat.org/releases/" version
|
||||
"/newsboat-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0pik1d98ydzqi6055vdbkjg5krwifbk2hy2f5jp5p1wcy2s16dn7"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(,@(fold alist-delete (package-native-inputs newsboat)
|
||||
'("asciidoctor" "openssl"))
|
||||
;; For building documentation.
|
||||
("asciidoc" ,asciidoc)))
|
||||
(inputs
|
||||
(modify-inputs (package-inputs newsboat)
|
||||
(replace "json-c" json-c-0.13)))
|
||||
(arguments
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure) ; no configure script
|
||||
(add-after 'build 'build-documentation
|
||||
(lambda _
|
||||
(invoke "make" "doc"))))
|
||||
#:make-flags
|
||||
(list (string-append "prefix=" (assoc-ref %outputs "out")))
|
||||
#:test-target "test"))))
|
||||
|
||||
(define-public liferea
|
||||
(package
|
||||
(name "liferea")
|
||||
@ -630,7 +597,7 @@ parser. It is \"not fit for use at this point\", but gfeeds uses it anyway.")
|
||||
python-readability-lxml
|
||||
python-requests
|
||||
syndication-domination
|
||||
webkitgtk-next))
|
||||
webkitgtk))
|
||||
(home-page "https://gfeeds.gabmus.org/")
|
||||
(synopsis "Easy-to-use GTK+ RSS/Atom feed reader")
|
||||
(description "Feeds is an RSS/Atom feed reader made with GTK+
|
||||
|
||||
@ -531,7 +531,7 @@ Telegram project, for its use in telegram desktop client.")
|
||||
rnnoise
|
||||
wayland
|
||||
wayland-protocols
|
||||
webkitgtk
|
||||
webkitgtk-for-gtk3
|
||||
webrtc-for-telegram-desktop
|
||||
xcb-util-keysyms
|
||||
xxhash
|
||||
|
||||
@ -3762,6 +3762,35 @@ This may help improve your viewers watching experience, and allows you to use
|
||||
your host privately.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public obs-pipewire-audio-capture
|
||||
(package
|
||||
(name "obs-pipewire-audio-capture")
|
||||
(version "1.1.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/dimtpap/obs-pipewire-audio-capture")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0qjl8xlaf54zgz34f1dfybdg2inc2ir42659kh15ncihpgbx0wzl"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #f ; no test target
|
||||
#:configure-flags
|
||||
#~(list (string-append "-DLIBOBS_INCLUDE_DIR="
|
||||
#$(this-package-input "obs") "/lib")
|
||||
"-Wno-dev")))
|
||||
(native-inputs (list libconfig pkg-config))
|
||||
(inputs (list obs pipewire))
|
||||
(home-page "https://obsproject.com/forum/resources/pipewire-audio-capture.1458/")
|
||||
(synopsis "Audio device and application capture for OBS Studio using PipeWire")
|
||||
(description "This plugin adds 3 sources for capturing audio outputs,
|
||||
inputs and applications using PipeWire.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public obs-websocket
|
||||
;; Functionality was merged into OBS.
|
||||
(deprecated-package "obs-websocket" obs))
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
|
||||
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
|
||||
;;; Copyright © 2022 Oleg Pykhalov <go.wigust@gmail.com>
|
||||
;;; Copyright © 2022 Ekaitz Zarraga <ekaitz@elenq.tech>
|
||||
;;; Copyright © 2022, 2023 Ekaitz Zarraga <ekaitz@elenq.tech>
|
||||
;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
|
||||
;;; Copyright © 2023 Juliana Sims <juli@incana.org>
|
||||
@ -166,14 +166,14 @@
|
||||
(define-public qemu
|
||||
(package
|
||||
(name "qemu")
|
||||
(version "8.1.1")
|
||||
(version "8.1.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qemu.org/qemu-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1vvxmd7xbkl083anpqm797m070qi8n5wc5qid0ppbyq0wpsjxkip"))
|
||||
(base32 "1fv5wbxpjxqzv10bdlq0ykgqfmzqx4s8yfch9zvqcm8h0il1gk23"))
|
||||
(patches (search-patches "qemu-disable-some-qtests-tests.patch"
|
||||
"qemu-fix-agent-paths.patch"))
|
||||
(modules '((guix build utils)))
|
||||
|
||||
@ -151,7 +151,7 @@
|
||||
telepathy-glib
|
||||
vte ; for st plugin
|
||||
wayland
|
||||
webkitgtk ; for www plugin
|
||||
webkitgtk-for-gtk3 ; for www plugin
|
||||
libx11
|
||||
libxext ; for xdmcp plugin
|
||||
xdg-utils
|
||||
|
||||
@ -706,7 +706,7 @@ driven and does not detract you from your daily work.")
|
||||
gsettings-desktop-schemas
|
||||
cl-gobject-introspection
|
||||
gtk+ ; For the main loop
|
||||
webkitgtk ; Required when we use its typelib
|
||||
webkitgtk-for-gtk3 ; Required when we use its typelib
|
||||
gobject-introspection
|
||||
pkg-config))
|
||||
(synopsis "Extensible web-browser in Common Lisp")
|
||||
|
||||
@ -126,14 +126,14 @@ engine that uses Wayland for graphics output.")
|
||||
|
||||
(define-public webkitgtk
|
||||
(package
|
||||
(name "webkitgtk") ; webkit2gtk4
|
||||
(version "2.40.5")
|
||||
(name "webkitgtk")
|
||||
(version "2.42.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.webkitgtk.org/releases/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0zq32rn34v7hzr53s100r77aglbi6wffp9b13bcj31k6cfi53q3x"))
|
||||
(base32 "1qnq2f6chsfns1psrqbbsqhgyb458zf75nlmzskb6a2n0hq4c6ha"))
|
||||
(patches (search-patches
|
||||
"webkitgtk-adjust-bubblewrap-paths.patch"))))
|
||||
(build-system cmake-build-system)
|
||||
@ -149,10 +149,8 @@ engine that uses Wayland for graphics output.")
|
||||
#:build-type "Release"
|
||||
#:configure-flags
|
||||
#~(list "-DPORT=GTK"
|
||||
;; GTKDOC will be removed upstream soon in favor of
|
||||
;; gi-docgen; it is normally disabled because the
|
||||
;; doc is rather expensive to build.
|
||||
"-DENABLE_GTKDOC=ON"
|
||||
"-DENABLE_INTROSPECTION=ON"
|
||||
"-DUSE_GTK4=ON"
|
||||
;; The minibrowser, not built by default, is a good
|
||||
;; tool to validate the good operation of
|
||||
;; webkitgtk.
|
||||
@ -232,7 +230,7 @@ engine that uses Wayland for graphics output.")
|
||||
ruby-2.7
|
||||
unifdef))
|
||||
(propagated-inputs
|
||||
(list gtk+ libsoup))
|
||||
(list gtk libsoup))
|
||||
(inputs
|
||||
(list at-spi2-core
|
||||
bubblewrap
|
||||
@ -249,8 +247,8 @@ engine that uses Wayland for graphics output.")
|
||||
libgcrypt
|
||||
libgudev
|
||||
libjpeg-turbo
|
||||
libjxl
|
||||
libmanette
|
||||
libnotify
|
||||
libpng
|
||||
libseccomp
|
||||
libsecret
|
||||
@ -283,34 +281,34 @@ propagated by default) such as @code{gst-plugins-good} and
|
||||
license:bsd-2
|
||||
license:bsd-3))))
|
||||
|
||||
(define-public webkitgtk-next
|
||||
(define-public webkitgtk-for-gtk3
|
||||
(package
|
||||
(inherit webkitgtk)
|
||||
(name "webkitgtk-next") ; webkit2gtk5
|
||||
(name "webkitgtk-for-gtk3")
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments webkitgtk)
|
||||
((#:configure-flags flags)
|
||||
#~(cons* "-DENABLE_INTROSPECTION=ON"
|
||||
"-DUSE_GTK4=ON"
|
||||
(delete "-DENABLE_GTKDOC=ON" #$flags)))))
|
||||
#~(cons* "-DENABLE_GTKDOC=ON"
|
||||
(delete "-DENABLE_INTROSPECTION=ON"
|
||||
(delete "-DUSE_GTK4=ON" #$flags))))))
|
||||
(propagated-inputs
|
||||
(modify-inputs (package-propagated-inputs webkitgtk)
|
||||
(replace "gtk+" gtk)))
|
||||
(replace "gtk" gtk+)))
|
||||
(inputs
|
||||
(modify-inputs (package-inputs webkitgtk)
|
||||
(delete "libnotify")))))
|
||||
(prepend libnotify)))))
|
||||
|
||||
;;; Required by e.g. emacs-next-pgtk, emacs-xwidgets, and some other GNOME
|
||||
;;; packages for webkit2gtk-4.0. See also the upstream tracker for libsoup 3:
|
||||
;;; https://gitlab.gnome.org/GNOME/libsoup/-/issues/218.
|
||||
(define-public webkitgtk-with-libsoup2
|
||||
(package/inherit webkitgtk
|
||||
(package/inherit webkitgtk-for-gtk3
|
||||
(name "webkitgtk-with-libsoup2")
|
||||
(arguments (substitute-keyword-arguments (package-arguments webkitgtk)
|
||||
(arguments (substitute-keyword-arguments (package-arguments webkitgtk-for-gtk3)
|
||||
((#:configure-flags flags)
|
||||
#~(cons "-DUSE_SOUP2=ON" #$flags))))
|
||||
(propagated-inputs
|
||||
(modify-inputs (package-propagated-inputs webkitgtk)
|
||||
(modify-inputs (package-propagated-inputs webkitgtk-for-gtk3)
|
||||
(replace "libsoup" libsoup-minimal-2)))))
|
||||
|
||||
(define-public wpewebkit
|
||||
|
||||
166
guix/build-system/composer.scm
Normal file
166
guix/build-system/composer.scm
Normal file
@ -0,0 +1,166 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (guix build-system composer)
|
||||
#:use-module (guix store)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix derivations)
|
||||
#:use-module (guix search-paths)
|
||||
#:use-module (guix build-system)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:export (%composer-build-system-modules
|
||||
lower
|
||||
composer-build
|
||||
composer-build-system))
|
||||
|
||||
;; Commentary:
|
||||
;;
|
||||
;; Standard build procedure for PHP packages using Composer. This is implemented
|
||||
;; as an extension of `gnu-build-system'.
|
||||
;;
|
||||
;; Code:
|
||||
|
||||
(define (default-php)
|
||||
"Return the default PHP package."
|
||||
|
||||
;; Do not use `@' to avoid introducing circular dependencies.
|
||||
(let ((module (resolve-interface '(gnu packages php))))
|
||||
(module-ref module 'php)))
|
||||
|
||||
(define (default-findclass)
|
||||
"Return the default findclass script."
|
||||
(search-auxiliary-file "findclass.php"))
|
||||
|
||||
(define (default-composer-classloader)
|
||||
"Return the default composer-classloader package."
|
||||
|
||||
;; Do not use `@' to avoid introducing circular dependencies.
|
||||
(let ((module (resolve-interface '(gnu packages php-xyz))))
|
||||
(module-ref module 'composer-classloader)))
|
||||
|
||||
(define %composer-build-system-modules
|
||||
;; Build-side modules imported by default.
|
||||
`((guix build composer-build-system)
|
||||
(guix build union)
|
||||
,@%gnu-build-system-modules))
|
||||
|
||||
(define* (lower name
|
||||
#:key source inputs native-inputs outputs system target
|
||||
(php (default-php))
|
||||
(composer-classloader (default-composer-classloader))
|
||||
(findclass (default-findclass))
|
||||
#:allow-other-keys
|
||||
#:rest arguments)
|
||||
"Return a bag for NAME."
|
||||
(define private-keywords
|
||||
'(#:target #:php #:composer-classloader #:findclass #:inputs #:native-inputs))
|
||||
|
||||
(and (not target) ;XXX: no cross-compilation
|
||||
(bag
|
||||
(name name)
|
||||
(system system)
|
||||
(host-inputs `(,@(if source
|
||||
`(("source" ,source))
|
||||
'())
|
||||
,@inputs
|
||||
|
||||
;; Keep the standard inputs of 'gnu-build-system'.
|
||||
,@(standard-packages)))
|
||||
(build-inputs `(("php" ,php)
|
||||
("findclass.php" ,findclass)
|
||||
("composer-classloader" ,composer-classloader)
|
||||
,@native-inputs))
|
||||
(outputs outputs)
|
||||
(build composer-build)
|
||||
(arguments (strip-keyword-arguments private-keywords arguments)))))
|
||||
|
||||
(define* (composer-build name inputs
|
||||
#:key
|
||||
guile source
|
||||
(outputs '("out"))
|
||||
(configure-flags ''())
|
||||
(search-paths '())
|
||||
(out-of-source? #t)
|
||||
(composer-file "composer.json")
|
||||
(tests? #t)
|
||||
(test-target "test")
|
||||
(test-flags ''())
|
||||
(install-target "install")
|
||||
(validate-runpath? #t)
|
||||
(patch-shebangs? #t)
|
||||
(strip-binaries? #t)
|
||||
(strip-flags #~'("--strip-debug"))
|
||||
(strip-directories #~'("lib" "lib64" "libexec"
|
||||
"bin" "sbin"))
|
||||
(phases '(@ (guix build composer-build-system)
|
||||
%standard-phases))
|
||||
(system (%current-system))
|
||||
(imported-modules %composer-build-system-modules)
|
||||
(modules '((guix build composer-build-system)
|
||||
(guix build utils))))
|
||||
"Build SOURCE using PHP, and with INPUTS. This assumes that SOURCE provides
|
||||
a 'composer.json' file as its build system."
|
||||
(define guile-json
|
||||
(module-ref (resolve-interface '(gnu packages guile))
|
||||
'guile-json-4))
|
||||
|
||||
(define builder
|
||||
(with-extensions (list guile-json)
|
||||
(with-imported-modules imported-modules
|
||||
#~(begin
|
||||
(use-modules #$@(sexp->gexp modules))
|
||||
|
||||
#$(with-build-variables inputs outputs
|
||||
#~(composer-build
|
||||
#:source #$source
|
||||
#:system #$system
|
||||
#:outputs %outputs
|
||||
#:inputs %build-inputs
|
||||
#:search-paths '#$(map search-path-specification->sexp
|
||||
search-paths)
|
||||
#:phases #$phases
|
||||
#:out-of-source? #$out-of-source?
|
||||
#:composer-file #$composer-file
|
||||
#:tests? #$tests?
|
||||
#:test-target #$test-target
|
||||
#:test-flags #$test-flags
|
||||
#:install-target #$install-target
|
||||
#:validate-runpath? #$validate-runpath?
|
||||
#:patch-shebangs? #$patch-shebangs?
|
||||
#:strip-binaries? #$strip-binaries?
|
||||
#:strip-flags #$strip-flags
|
||||
#:strip-directories #$strip-directories))))))
|
||||
|
||||
(gexp->derivation name builder
|
||||
#:system system
|
||||
#:target #f
|
||||
#:graft? #f
|
||||
#:guile-for-build guile))
|
||||
|
||||
(define composer-build-system
|
||||
(build-system
|
||||
(name 'composer)
|
||||
(description "The standard Composer build system")
|
||||
(lower lower)))
|
||||
|
||||
;;; composer.scm ends here
|
||||
186
guix/build-system/mix.scm
Normal file
186
guix/build-system/mix.scm
Normal file
@ -0,0 +1,186 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2023 Pierre-Henry Fröhring <contact@phfrohring.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
;; Commentary:
|
||||
;;
|
||||
;; Standard build procedure for Elixir packages using 'mix'. This is
|
||||
;; implemented as an extension of 'gnu-build-system'.
|
||||
;;
|
||||
;; Code:
|
||||
|
||||
(define-module (guix build-system mix)
|
||||
#:use-module (guix build mix-build-system)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix monads)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix search-paths)
|
||||
#:use-module (guix store)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-26)
|
||||
#:export (mix-build-system hexpm-uri))
|
||||
|
||||
;; Lazily resolve bindings to avoid circular dependencies.
|
||||
(define (default-glibc-utf8-locales)
|
||||
(let* ((base (resolve-interface '(gnu packages base))))
|
||||
(module-ref base 'glibc-utf8-locales)))
|
||||
|
||||
(define (default-elixir-hex)
|
||||
(let ((elixir (resolve-interface '(gnu packages elixir))))
|
||||
(module-ref elixir 'elixir-hex)))
|
||||
|
||||
(define (default-rebar3)
|
||||
(let ((erlang (resolve-interface '(gnu packages erlang))))
|
||||
(module-ref erlang 'rebar3)))
|
||||
|
||||
(define (default-elixir)
|
||||
(let ((elixir (resolve-interface '(gnu packages elixir))))
|
||||
(module-ref elixir 'elixir)))
|
||||
|
||||
(define* (strip-prefix name #:optional (prefix "elixir-"))
|
||||
"Return NAME without the prefix PREFIX."
|
||||
(if (string-prefix? prefix name)
|
||||
(string-drop name (string-length prefix))
|
||||
name))
|
||||
|
||||
(define (hexpm-uri name version)
|
||||
"Return the URI where to fetch the sources of a Hex package NAME at VERSION.
|
||||
NAME is the name of the package which should look like: elixir-pkg-name-X.Y.Z
|
||||
See: https://github.com/hexpm/specifications/blob/main/endpoints.md"
|
||||
((compose
|
||||
(cute string-append "https://repo.hex.pm/tarballs/" <> "-" version ".tar")
|
||||
(cute string-replace-substring <> "-" "_")
|
||||
strip-prefix)
|
||||
name))
|
||||
|
||||
;; A number of environment variables specific to the Mix build system are
|
||||
;; reflected here. They are documented at
|
||||
;; https://hexdocs.pm/mix/1.15.7/Mix.html#module-environment-variables. Other
|
||||
;; parameters located in mix.exs are defined at
|
||||
;; https://hexdocs.pm/mix/1.15.7/Mix.Project.html#module-configuration
|
||||
(define* (mix-build name
|
||||
inputs
|
||||
#:key
|
||||
source
|
||||
(tests? #t)
|
||||
(mix-path #f) ;See MIX_PATH.
|
||||
(mix-exs "mix.exs") ;See MIX_EXS.
|
||||
(build-per-environment #t) ;See :build_per_environment.
|
||||
(phases '%standard-phases)
|
||||
(outputs '("out"))
|
||||
(search-paths '())
|
||||
(system (%current-system))
|
||||
(guile #f)
|
||||
(imported-modules `((guix build mix-build-system)
|
||||
,@%gnu-build-system-modules))
|
||||
(modules '((guix build mix-build-system)
|
||||
(guix build utils))))
|
||||
"Build SOURCE using Elixir, and with INPUTS."
|
||||
|
||||
;; Check the documentation of :build_per_environment here:
|
||||
;; https://hexdocs.pm/mix/1.15.7/Mix.Project.html#module-configuration And
|
||||
;; "Environments" here:
|
||||
;; https://hexdocs.pm/mix/1.15.7/Mix.html#module-environments
|
||||
(define mix-environments
|
||||
(if build-per-environment
|
||||
`("prod" ,@(if tests? '("test") '()))
|
||||
'("shared")))
|
||||
|
||||
(define builder
|
||||
(with-imported-modules imported-modules
|
||||
#~(begin
|
||||
|
||||
(use-modules #$@(sexp->gexp modules))
|
||||
|
||||
#$(with-build-variables inputs outputs
|
||||
#~(mix-build #:name #$name
|
||||
#:source #+source
|
||||
#:system #$system
|
||||
#:tests? #$tests?
|
||||
#:mix-path #$mix-path
|
||||
#:mix-exs #$mix-exs
|
||||
#:mix-environments '#$mix-environments
|
||||
#:build-per-environment #$build-per-environment
|
||||
#:phases #$(if (pair? phases)
|
||||
(sexp->gexp phases)
|
||||
phases)
|
||||
#:outputs %outputs
|
||||
#:search-paths '#$(sexp->gexp
|
||||
(map
|
||||
search-path-specification->sexp
|
||||
search-paths))
|
||||
#:inputs
|
||||
%build-inputs)))))
|
||||
|
||||
(mlet %store-monad ((guile (package->derivation (or guile (default-guile))
|
||||
system
|
||||
#:graft? #f)))
|
||||
(gexp->derivation name
|
||||
builder
|
||||
#:system system
|
||||
#:graft? #f ;consistent with 'gnu-build'
|
||||
#:target #f
|
||||
#:guile-for-build guile)))
|
||||
|
||||
(define* (lower name
|
||||
#:key
|
||||
(elixir (default-elixir))
|
||||
(elixir-hex (default-elixir-hex))
|
||||
(glibc-utf8-locales (default-glibc-utf8-locales))
|
||||
(inputs '())
|
||||
(native-inputs '())
|
||||
(propagated-inputs '())
|
||||
(rebar3 (default-rebar3))
|
||||
(tests? #t)
|
||||
outputs
|
||||
source
|
||||
system
|
||||
target
|
||||
#:allow-other-keys #:rest arguments)
|
||||
"Return a bag for NAME."
|
||||
(let ((private-keywords
|
||||
'(#:inputs #:native-inputs
|
||||
#:outputs #:system #:target
|
||||
#:elixir #:elixir-hex #:glibc-utf8-locales
|
||||
#:rebar3 #:erlang))
|
||||
(build-inputs
|
||||
`(,@(standard-packages)
|
||||
("glibc-utf8-locales" ,glibc-utf8-locales)
|
||||
("erlang" ,(lookup-package-input elixir "erlang"))
|
||||
("rebar3" ,rebar3)
|
||||
("elixir" ,elixir)
|
||||
("elixir-hex" ,elixir-hex)
|
||||
,@inputs
|
||||
,@native-inputs)))
|
||||
(bag (name name)
|
||||
(system system)
|
||||
(build-inputs build-inputs)
|
||||
(host-inputs (if target inputs '()))
|
||||
(outputs outputs)
|
||||
(build mix-build)
|
||||
(arguments (strip-keyword-arguments private-keywords arguments)))))
|
||||
|
||||
(define mix-build-system
|
||||
(build-system (name 'mix)
|
||||
(description "The standard Mix build system")
|
||||
(lower lower)))
|
||||
|
||||
;;; mix.scm ends here
|
||||
301
guix/build/composer-build-system.scm
Normal file
301
guix/build/composer-build-system.scm
Normal file
@ -0,0 +1,301 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (guix build composer-build-system)
|
||||
#:use-module ((guix build gnu-build-system) #:prefix gnu:)
|
||||
#:use-module (guix build utils)
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module (json)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-26)
|
||||
#:export (%standard-phases
|
||||
composer-build))
|
||||
|
||||
;; Commentary:
|
||||
;;
|
||||
;; Builder-side code of the standard composer build procedure.
|
||||
;;
|
||||
;; Code:
|
||||
|
||||
(define (json->require dict)
|
||||
(if dict
|
||||
(let loop ((result '()) (require dict))
|
||||
(match require
|
||||
(() result)
|
||||
((((? (cut string-contains <> "/") name) . _)
|
||||
require ...)
|
||||
(loop (cons name result) require))
|
||||
((_ require ...) (loop result require))
|
||||
(_ result)))
|
||||
'()))
|
||||
|
||||
(define (if-specified-to-list fn)
|
||||
(match-lambda
|
||||
((? unspecified?) '())
|
||||
(arg (fn arg))
|
||||
(_ '())))
|
||||
|
||||
(define-json-mapping <composer-autoload> make-composer-autoload
|
||||
composer-autoload?
|
||||
json->composer-autoload
|
||||
(psr-4 composer-autoload-psr-4 "psr-4"
|
||||
(match-lambda
|
||||
((? unspecified?) '())
|
||||
((? (lambda (al)
|
||||
(and (list? al) (pair? (car al)) (vector? (cdar al)))) al)
|
||||
(append-map
|
||||
(lambda (vect-el)
|
||||
(list (cons (caar al) vect-el)))
|
||||
(vector->list (cdar al))))
|
||||
((? list? l) l)
|
||||
(_ '())))
|
||||
(psr-0 composer-autoload-psr-0 "psr-0" (if-specified-to-list identity))
|
||||
(classmap composer-autoload-classmap "classmap"
|
||||
(if-specified-to-list vector->list))
|
||||
(files composer-autoload-files "files"
|
||||
(if-specified-to-list vector->list)))
|
||||
|
||||
(define-json-mapping <composer-package> make-composer-package composer-package?
|
||||
json->composer-package
|
||||
(name composer-package-name)
|
||||
(autoload composer-package-autoload "autoload"
|
||||
(if-specified-to-list json->composer-autoload))
|
||||
(autoload-dev composer-package-autoload-dev "autoload-dev"
|
||||
(if-specified-to-list json->composer-autoload))
|
||||
(require composer-package-require "require" json->require)
|
||||
(dev-require composer-package-dev-require "require-dev" json->require)
|
||||
(scripts composer-package-scripts "scripts"
|
||||
(if-specified-to-list identity))
|
||||
(binaries composer-package-binaries "bin"
|
||||
(if-specified-to-list vector->list)))
|
||||
|
||||
(define* (read-package-data #:key (filename "composer.json"))
|
||||
(call-with-input-file filename
|
||||
(lambda (port)
|
||||
(json->composer-package (json->scm port)))))
|
||||
|
||||
(define* (create-test-autoload #:key composer-file inputs outputs tests?
|
||||
#:allow-other-keys)
|
||||
"Create the autoload.php file for tests. This is a standalone phase so that
|
||||
the autoload.php file can be edited before the check phase."
|
||||
(when tests?
|
||||
(mkdir-p "vendor")
|
||||
(create-autoload (string-append (getcwd) "/vendor") composer-file
|
||||
inputs #:dev-dependencies? #t)))
|
||||
|
||||
(define (find-bin script inputs)
|
||||
(search-input-file inputs
|
||||
(string-append
|
||||
"bin/"
|
||||
(string-drop script (string-length "vendor/bin/")))))
|
||||
|
||||
(define* (check #:key composer-file inputs
|
||||
tests? test-target test-flags #:allow-other-keys)
|
||||
"Test the given package.
|
||||
Please note that none of the PHP packages at the time of the rewrite of the
|
||||
build-system did use the test-script field. This means that the @code{match
|
||||
test-script} part is not tested on a real example and relies on the original
|
||||
implementation."
|
||||
(if tests?
|
||||
(let* ((package-data (read-package-data #:filename composer-file))
|
||||
(scripts (composer-package-scripts package-data))
|
||||
(test-script (assoc-ref scripts test-target)))
|
||||
(match test-script
|
||||
((? string? bin)
|
||||
(let ((command (find-bin bin inputs)))
|
||||
(unless (zero? (apply system command test-flags))
|
||||
(throw 'failed-command command))))
|
||||
(('@ (? string? bins) ...)
|
||||
(for-each
|
||||
(lambda (c)
|
||||
(let ((command (find-bin c inputs)))
|
||||
(unless (zero? (apply system command test-flags))
|
||||
(throw 'failed-command command))))
|
||||
bins))
|
||||
(_ (if (file-exists? "phpunit.xml.dist")
|
||||
(apply invoke
|
||||
(with-exception-handler
|
||||
(lambda (exn)
|
||||
(if (search-error? exn)
|
||||
(error "\
|
||||
Missing php-phpunit-phpunit native input.~%")
|
||||
(raise exn)))
|
||||
(lambda ()
|
||||
(search-input-file (or inputs '()) "bin/phpunit")))
|
||||
test-flags))
|
||||
(format #t "No test suite found.~%"))))
|
||||
(format #t "Test suite not run.~%")))
|
||||
|
||||
(define* (create-autoload vendor composer-file inputs #:key dev-dependencies?)
|
||||
"creates an autoload.php file that sets up the class locations for this package,
|
||||
so it can be autoloaded by PHP when the package classes are required."
|
||||
(with-output-to-file (string-append vendor "/autoload.php")
|
||||
(lambda _
|
||||
(display (string-append
|
||||
"<?php
|
||||
// autoload.php @generated by Guix
|
||||
$psr4map = $classmap = array();
|
||||
require_once '" vendor "/autoload_conf.php';
|
||||
require_once '" (assoc-ref inputs "composer-classloader") "/share/web/composer/ClassLoader.php';
|
||||
$loader = new \\Composer\\Autoload\\ClassLoader();
|
||||
foreach ($psr4map as $namespace => $paths) {
|
||||
foreach ($paths as $path) {
|
||||
$loader->addPsr4($namespace, $path);
|
||||
}
|
||||
}
|
||||
$loader->addClassMap($classmap);
|
||||
$loader->register();
|
||||
"))))
|
||||
;; Now, create autoload_conf.php that contains the actual data, as a set
|
||||
;; of arrays
|
||||
(let* ((package-data (read-package-data #:filename composer-file))
|
||||
(autoload (composer-package-autoload package-data))
|
||||
(autoload-dev (composer-package-autoload-dev package-data))
|
||||
(dependencies (composer-package-require package-data))
|
||||
(dependencies-dev (composer-package-dev-require package-data)))
|
||||
(with-output-to-file (string-append vendor "/autoload_conf.php")
|
||||
(lambda _
|
||||
(format #t "<?php~%")
|
||||
(format #t "// autoload_conf.php @generated by Guix~%")
|
||||
(force-output)
|
||||
(for-each
|
||||
(match-lambda
|
||||
((key . value)
|
||||
(let ((vals (if (list? value)
|
||||
(reverse value)
|
||||
(list value))))
|
||||
(apply
|
||||
format
|
||||
#t
|
||||
(string-append
|
||||
"$psr4map['~a'][] = ["
|
||||
(string-join
|
||||
(make-list (length vals) "'~a/../~a'") ",")
|
||||
"];~%")
|
||||
(cons* (string-join (string-split key #\\) "\\\\")
|
||||
(append-map (lambda (v) (list vendor v)) vals)))))
|
||||
(_ (format #t "")))
|
||||
(delete-duplicates
|
||||
(append
|
||||
(composer-autoload-psr-4 autoload)
|
||||
(if (and dev-dependencies? (not (null? autoload-dev)))
|
||||
(composer-autoload-psr-4 autoload-dev)
|
||||
'()))
|
||||
'()))
|
||||
(for-each
|
||||
(lambda (psr0)
|
||||
(match psr0
|
||||
((key . value)
|
||||
(format #t "$psr4map['~a'][] = ['~a/../~a/~a'];~%"
|
||||
(string-join (string-split key #\\) "\\\\")
|
||||
vendor
|
||||
value
|
||||
(string-join (string-split key #\\) "/")))
|
||||
(_ (format #t ""))))
|
||||
(append
|
||||
(composer-autoload-psr-0 autoload)
|
||||
(if (and dev-dependencies? (not (null? autoload-dev)))
|
||||
(composer-autoload-psr-0 autoload-dev)
|
||||
'())))
|
||||
(for-each
|
||||
(lambda (classmap)
|
||||
(for-each
|
||||
(lambda (file)
|
||||
(invoke "php" (assoc-ref inputs "findclass.php")
|
||||
"-i" (string-append vendor "/..") "-f" file))
|
||||
(find-files classmap ".(php|hh|inc)$")))
|
||||
(append
|
||||
(composer-autoload-classmap autoload)
|
||||
(if (and dev-dependencies? (not (null? autoload-dev)))
|
||||
(composer-autoload-classmap autoload-dev)
|
||||
'())))
|
||||
(for-each
|
||||
(lambda (file)
|
||||
(format #t "require_once '~a/../~a';~%" vendor file))
|
||||
(append
|
||||
(composer-autoload-files autoload)
|
||||
(if (and dev-dependencies? (not (null? autoload-dev)))
|
||||
(composer-autoload-files autoload-dev)
|
||||
'())))
|
||||
(for-each
|
||||
(lambda (dep)
|
||||
(format
|
||||
#t "require_once '~a';~%"
|
||||
(search-input-file
|
||||
inputs
|
||||
(string-append "/share/web/" dep "/vendor/autoload_conf.php"))))
|
||||
dependencies)
|
||||
;; Also add native-inputs that are not necessarily given in the
|
||||
;; composer.json. This allows to simply add a package in tests by
|
||||
;; adding it in native-inputs, without the need to patch composer.json.
|
||||
(for-each
|
||||
(match-lambda
|
||||
((name . loc)
|
||||
(match (find-files loc "autoload_conf\\.php$")
|
||||
(() #t)
|
||||
(((? string? conf) . ())
|
||||
(format #t "require_once '~a';~%" conf))
|
||||
(_ #t)))
|
||||
(_ #t))
|
||||
(or inputs '()))))))
|
||||
|
||||
(define* (install #:key inputs outputs composer-file #:allow-other-keys)
|
||||
"Install the given package."
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(package-data (read-package-data #:filename composer-file))
|
||||
(name (composer-package-name package-data))
|
||||
(php-dir (string-append out "/share/web/" name))
|
||||
(bin-dir (string-append php-dir "/vendor/bin"))
|
||||
(bin (string-append out "/bin"))
|
||||
(binaries (composer-package-binaries package-data)))
|
||||
(mkdir-p php-dir)
|
||||
(copy-recursively "." php-dir)
|
||||
(mkdir-p (string-append php-dir "/vendor"))
|
||||
(when binaries
|
||||
(mkdir-p bin-dir)
|
||||
(mkdir-p bin)
|
||||
(for-each
|
||||
(lambda (file)
|
||||
(let ((installed-file (string-append bin-dir "/" (basename file)))
|
||||
(bin-file (string-append bin "/" (basename file)))
|
||||
(original-file (string-append php-dir "/" file)))
|
||||
(symlink original-file installed-file)
|
||||
(symlink original-file bin-file)))
|
||||
binaries))
|
||||
(create-autoload (string-append php-dir "/vendor")
|
||||
composer-file inputs)))
|
||||
|
||||
(define %standard-phases
|
||||
;; Everything is as with the GNU Build System except for the `configure'
|
||||
;; , `build', `check' and `install' phases.
|
||||
(modify-phases gnu:%standard-phases
|
||||
(delete 'bootstrap)
|
||||
(delete 'configure)
|
||||
(delete 'build)
|
||||
(delete 'check)
|
||||
(replace 'install install)
|
||||
(add-after 'install 'check check)
|
||||
(add-after 'install 'create-test-autoload create-test-autoload)))
|
||||
|
||||
(define* (composer-build #:key inputs (phases %standard-phases)
|
||||
#:allow-other-keys #:rest args)
|
||||
"Build the given package, applying all of PHASES in order."
|
||||
(apply gnu:gnu-build #:inputs inputs #:phases phases args))
|
||||
|
||||
;;; composer-build-system.scm ends here
|
||||
161
guix/build/mix-build-system.scm
Normal file
161
guix/build/mix-build-system.scm
Normal file
@ -0,0 +1,161 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2023 Pierre-Henry Fröhring <contact@phfrohring.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
;; Commentary:
|
||||
;;
|
||||
;; Code:
|
||||
|
||||
(define-module (guix build mix-build-system)
|
||||
#:use-module ((guix build gnu-build-system) #:prefix gnu:)
|
||||
#:use-module (guix build utils)
|
||||
#:use-module (ice-9 ftw)
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module (ice-9 regex)
|
||||
#:use-module (ice-9 string-fun)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-26)
|
||||
#:use-module (srfi srfi-71)
|
||||
#:export (mix-build
|
||||
%standard-phases))
|
||||
|
||||
;; The Elixir version is constant as soon as it is computable from the current
|
||||
;; execution. It is a X.Y string where X and Y are respectively the major and
|
||||
;; minor version number of the Elixir used in the build.
|
||||
(define %elixir-version (make-parameter "X.Y"))
|
||||
|
||||
(define* (elixir-libdir path #:optional (version (%elixir-version)))
|
||||
"Return the path where all libraries under PATH for a specified Elixir
|
||||
VERSION are installed."
|
||||
(string-append path "/lib/elixir/" version))
|
||||
|
||||
(define* (strip-prefix name #:optional (prefix "elixir-"))
|
||||
"Return NAME without the prefix PREFIX."
|
||||
(if (string-prefix? prefix name)
|
||||
(string-drop name (string-length prefix))
|
||||
name))
|
||||
|
||||
(define (mix-build-dir mix-build-root mix-env)
|
||||
"Return the directory where build artifacts are to be installed according to
|
||||
en environment MIX-ENV in the current directory. MIX-BUILD-ROOT depends on the
|
||||
package arguments. See: https://hexdocs.pm/mix/1.15/Mix.html#module-environment-variables"
|
||||
(string-append mix-build-root "/" mix-env "/lib"))
|
||||
|
||||
(define (elixir-version inputs)
|
||||
"Return an X.Y string where X and Y are respectively the major and minor version number of PACKAGE.
|
||||
Example: /gnu/store/…-elixir-1.14.0 → 1.14"
|
||||
((compose
|
||||
(cute string-join <> ".")
|
||||
(cute take <> 2)
|
||||
(cute string-split <> #\.)
|
||||
strip-prefix
|
||||
strip-store-file-name)
|
||||
(assoc-ref inputs "elixir")))
|
||||
|
||||
(define* (unpack #:key source mix-path #:allow-other-keys)
|
||||
"Unpack SOURCE in the working directory, and change directory within the
|
||||
source. When SOURCE is a directory, copy it in a sub-directory of the current
|
||||
working directory."
|
||||
(let ((gnu-unpack (assoc-ref gnu:%standard-phases 'unpack)))
|
||||
(gnu-unpack #:source source)
|
||||
(when (file-exists? "contents.tar.gz")
|
||||
(invoke "tar" "xvf" "contents.tar.gz"))))
|
||||
|
||||
(define (list-directories dir)
|
||||
"List absolute paths of directories directly under the directory DIR."
|
||||
(map (cute string-append dir "/" <>)
|
||||
(scandir dir (lambda (filename)
|
||||
(and (not (member filename '("." "..")))
|
||||
(directory-exists? (string-append dir "/" filename)))))))
|
||||
|
||||
(define* (set-mix-env #:key inputs mix-path mix-exs #:allow-other-keys)
|
||||
"Set environment variables.
|
||||
See: https://hexdocs.pm/mix/1.15.7/Mix.html#module-environment-variables"
|
||||
(setenv "MIX_ARCHIVES" "archives")
|
||||
(setenv "MIX_BUILD_ROOT" "_build")
|
||||
(setenv "MIX_DEPS_PATH" "deps")
|
||||
(setenv "MIX_EXS" mix-exs)
|
||||
(setenv "MIX_HOME" (getcwd))
|
||||
(setenv "MIX_PATH" (or mix-path ""))
|
||||
(setenv "MIX_REBAR3" (string-append (assoc-ref inputs "rebar3") "/bin/rebar3")))
|
||||
|
||||
(define* (set-elixir-version #:key inputs #:allow-other-keys)
|
||||
"Store the version number of the Elixir input in a parameter."
|
||||
(%elixir-version (elixir-version inputs))
|
||||
(format #t "Elixir version: ~a~%" (%elixir-version)))
|
||||
|
||||
(define* (build #:key mix-environments #:allow-other-keys)
|
||||
"Builds the Mix project."
|
||||
(for-each (lambda (mix-env)
|
||||
(setenv "MIX_ENV" mix-env)
|
||||
(invoke "mix" "compile" "--no-deps-check"))
|
||||
mix-environments))
|
||||
|
||||
(define* (check #:key (tests? #t) #:allow-other-keys)
|
||||
"Test the Mix project."
|
||||
(if tests?
|
||||
(invoke "mix" "test" "--no-deps-check")
|
||||
(format #t "tests? = ~a~%" tests?)))
|
||||
|
||||
(define* (remove-mix-dirs . _)
|
||||
"Remove all .mix/ directories.
|
||||
We do not want to copy them to the installation directory."
|
||||
(for-each delete-file-recursively
|
||||
(find-files "." (file-name-predicate "\\.mix$") #:directories? #t)))
|
||||
|
||||
(define (package-name->elixir-name name+ver)
|
||||
"Convert the Guix package NAME-VER to the corresponding Elixir name-version
|
||||
format. Example: elixir-a-pkg-1.2.3 -> a_pkg"
|
||||
((compose
|
||||
(cute string-join <> "_")
|
||||
(cute drop-right <> 1)
|
||||
(cute string-split <> #\-))
|
||||
(strip-prefix name+ver)))
|
||||
|
||||
(define* (install #:key
|
||||
inputs
|
||||
outputs
|
||||
name
|
||||
build-per-environment
|
||||
#:allow-other-keys)
|
||||
"Install build artifacts in the store."
|
||||
(let* ((lib-name (package-name->elixir-name name))
|
||||
(lib-dir (string-append (elixir-libdir (assoc-ref outputs "out")) "/" lib-name))
|
||||
(root (getenv "MIX_BUILD_ROOT"))
|
||||
(env (if build-per-environment "prod" "shared")))
|
||||
(mkdir-p lib-dir)
|
||||
(copy-recursively (string-append (mix-build-dir root env) "/" lib-name) lib-dir
|
||||
#:follow-symlinks? #t)))
|
||||
|
||||
(define %standard-phases
|
||||
(modify-phases gnu:%standard-phases
|
||||
(delete 'bootstrap)
|
||||
(delete 'configure)
|
||||
(add-after 'install-locale 'set-mix-env set-mix-env)
|
||||
(add-after 'set-mix-env 'set-elixir-version set-elixir-version)
|
||||
(replace 'unpack unpack)
|
||||
(replace 'build build)
|
||||
(replace 'check check)
|
||||
(add-before 'install 'remove-mix-dirs remove-mix-dirs)
|
||||
(replace 'install install)))
|
||||
|
||||
(define* (mix-build #:key inputs (phases %standard-phases)
|
||||
#:allow-other-keys #:rest args)
|
||||
"Build the given Mix package, applying all of PHASES in order."
|
||||
(apply gnu:gnu-build #:inputs inputs #:phases phases args))
|
||||
|
||||
;;; mix-build-system.scm ends here
|
||||
268
guix/import/composer.scm
Normal file
268
guix/import/composer.scm
Normal file
@ -0,0 +1,268 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (guix import composer)
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module (json)
|
||||
#:use-module (guix hash)
|
||||
#:use-module (guix base32)
|
||||
#:use-module (guix build git)
|
||||
#:use-module (guix build utils)
|
||||
#:use-module (guix build-system)
|
||||
#:use-module (guix build-system composer)
|
||||
#:use-module (guix import json)
|
||||
#:use-module (guix import utils)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix memoization)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix serialization)
|
||||
#:use-module (guix upstream)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-11)
|
||||
#:use-module (srfi srfi-26)
|
||||
#:export (composer->guix-package
|
||||
%composer-updater
|
||||
composer-recursive-import
|
||||
|
||||
%composer-base-url))
|
||||
|
||||
(define %composer-base-url
|
||||
(make-parameter "https://repo.packagist.org"))
|
||||
|
||||
(define (fix-version version)
|
||||
"Return a fixed version from a version string. For instance, v10.1 -> 10.1"
|
||||
(cond
|
||||
((string-prefix? "version" version)
|
||||
(if (char-set-contains? char-set:digit (string-ref version 7))
|
||||
(substring version 7)
|
||||
(substring version 8)))
|
||||
((string-prefix? "v" version)
|
||||
(substring version 1))
|
||||
(else version)))
|
||||
|
||||
(define (latest-version versions)
|
||||
(fold (lambda (a b) (if (version>? (fix-version a) (fix-version b)) a b))
|
||||
(car versions) versions))
|
||||
|
||||
(define (json->require dict)
|
||||
(if dict
|
||||
(let loop ((result '()) (require dict))
|
||||
(match require
|
||||
(() result)
|
||||
((((? (cut string-contains <> "/") name) . _)
|
||||
require ...)
|
||||
(loop (cons name result) require))
|
||||
((_ require ...) (loop result require))
|
||||
(_ result)))
|
||||
'()))
|
||||
|
||||
(define-json-mapping <composer-source> make-composer-source composer-source?
|
||||
json->composer-source
|
||||
(type composer-source-type)
|
||||
(url composer-source-url)
|
||||
(reference composer-source-reference))
|
||||
|
||||
(define-json-mapping <composer-package> make-composer-package composer-package?
|
||||
json->composer-package
|
||||
(description composer-package-description)
|
||||
(homepage composer-package-homepage)
|
||||
(source composer-package-source "source" json->composer-source)
|
||||
(name composer-package-name "name" php-package-name)
|
||||
(version composer-package-version "version" fix-version)
|
||||
(require composer-package-require "require" json->require)
|
||||
(dev-require composer-package-dev-require "require-dev" json->require)
|
||||
(license composer-package-license "license"
|
||||
(lambda (vector)
|
||||
(let ((l (map string->license (vector->list vector))))
|
||||
(if (eq? (length l) 1)
|
||||
(car l)
|
||||
`(list ,@l))))))
|
||||
|
||||
(define (valid-version? v)
|
||||
(let ((d (string-downcase v)))
|
||||
(and (not (string-contains d "dev"))
|
||||
(not (string-contains d "beta"))
|
||||
(not (string-contains d "rc")))))
|
||||
|
||||
(define* (composer-fetch name #:key (version #f))
|
||||
"Return a composer-package representation of the Composer metadata for the
|
||||
package NAME with optional VERSION, or #f on failure."
|
||||
(let* ((url (string-append (%composer-base-url) "/p/" name ".json"))
|
||||
(packages (and=> (json-fetch url)
|
||||
(lambda (pkg)
|
||||
(let ((pkgs (assoc-ref pkg "packages")))
|
||||
(or (assoc-ref pkgs name) pkg))))))
|
||||
(if packages
|
||||
(json->composer-package
|
||||
(if version
|
||||
(assoc-ref packages version)
|
||||
(cdr
|
||||
(reduce
|
||||
(lambda (new cur-max)
|
||||
(match new
|
||||
(((? valid-version? version) . tail)
|
||||
(if (version>? (fix-version version)
|
||||
(fix-version (car cur-max)))
|
||||
(cons* version tail)
|
||||
cur-max))
|
||||
(_ cur-max)))
|
||||
(cons* "0.0.0" #f)
|
||||
packages))))
|
||||
#f)))
|
||||
|
||||
(define (php-package-name name)
|
||||
"Given the NAME of a package on Packagist, return a Guix-compliant name for
|
||||
the package."
|
||||
(let ((name (string-join (string-split name #\/) "-")))
|
||||
(if (string-prefix? "php-" name)
|
||||
(snake-case name)
|
||||
(string-append "php-" (snake-case name)))))
|
||||
|
||||
(define (make-php-sexp composer-package)
|
||||
"Return the `package' s-expression for a PHP package for the given
|
||||
COMPOSER-PACKAGE."
|
||||
(let* ((source (composer-package-source composer-package))
|
||||
(dependencies (map php-package-name
|
||||
(composer-package-require composer-package)))
|
||||
(dev-dependencies (map php-package-name
|
||||
(composer-package-dev-require composer-package)))
|
||||
(git? (equal? (composer-source-type source) "git")))
|
||||
((if git? call-with-temporary-directory call-with-temporary-output-file)
|
||||
(lambda* (temp #:optional port)
|
||||
(and (if git?
|
||||
(begin
|
||||
(mkdir-p temp)
|
||||
(git-fetch (composer-source-url source)
|
||||
(composer-source-reference source)
|
||||
temp))
|
||||
(url-fetch (composer-source-url source) temp))
|
||||
`(package
|
||||
(name ,(composer-package-name composer-package))
|
||||
(version ,(composer-package-version composer-package))
|
||||
(source
|
||||
(origin
|
||||
,@(if git?
|
||||
`((method git-fetch)
|
||||
(uri (git-reference
|
||||
(url ,(if (string-suffix?
|
||||
".git"
|
||||
(composer-source-url source))
|
||||
(string-drop-right
|
||||
(composer-source-url source)
|
||||
(string-length ".git"))
|
||||
(composer-source-url source)))
|
||||
(commit ,(composer-source-reference source))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
,(bytevector->nix-base32-string
|
||||
(file-hash* temp)))))
|
||||
`((method url-fetch)
|
||||
(uri ,(composer-source-url source))
|
||||
(sha256 (base32 ,(guix-hash-url temp)))))))
|
||||
(build-system composer-build-system)
|
||||
,@(if (null? dependencies)
|
||||
'()
|
||||
`((inputs
|
||||
(list ,@(map string->symbol dependencies)))))
|
||||
,@(if (null? dev-dependencies)
|
||||
'()
|
||||
`((native-inputs
|
||||
(list ,@(map string->symbol dev-dependencies)))))
|
||||
(synopsis "")
|
||||
(description ,(composer-package-description composer-package))
|
||||
(home-page ,(composer-package-homepage composer-package))
|
||||
(license ,(or (composer-package-license composer-package)
|
||||
'unknown-license!))))))))
|
||||
|
||||
(define composer->guix-package
|
||||
(memoize
|
||||
(lambda* (package-name #:key (version #f) #:allow-other-keys)
|
||||
"Fetch the metadata for PACKAGE-NAME from packagist.org, and return the
|
||||
`package' s-expression corresponding to that package and its list of
|
||||
dependencies, or #f and the empty list on failure."
|
||||
(let ((package (composer-fetch package-name #:version version)))
|
||||
(if package
|
||||
(let* ((dependencies-names (composer-package-require package))
|
||||
(dev-dependencies-names (composer-package-dev-require package)))
|
||||
(values (make-php-sexp package)
|
||||
(append dependencies-names dev-dependencies-names)))
|
||||
(values #f '()))))))
|
||||
|
||||
(define (guix-name->composer-name name)
|
||||
"Given a guix package name, return the name of the package in Packagist."
|
||||
(if (string-prefix? "php-" name)
|
||||
(let ((components (string-split (substring name 4) #\-)))
|
||||
(match components
|
||||
((namespace name ...)
|
||||
(string-append namespace "/" (string-join name "-")))))
|
||||
name))
|
||||
|
||||
(define (guix-package->composer-name package)
|
||||
"Given a Composer PACKAGE built from Packagist, return the name of the
|
||||
package in Packagist."
|
||||
(let ((upstream-name (assoc-ref
|
||||
(package-properties package)
|
||||
'upstream-name))
|
||||
(name (package-name package)))
|
||||
(if upstream-name
|
||||
upstream-name
|
||||
(guix-name->composer-name name))))
|
||||
|
||||
(define (string->license str)
|
||||
"Convert the string STR into a license object."
|
||||
(or (spdx-string->license str)
|
||||
(match str
|
||||
("GNU LGPL" 'license:lgpl2.0)
|
||||
("GPL" 'license:gpl3)
|
||||
((or "BSD" "BSD License") 'license:bsd-3)
|
||||
((or "MIT" "MIT license" "Expat license") 'license:expat)
|
||||
("Public domain" 'license:public-domain)
|
||||
((or "Apache License, Version 2.0" "Apache 2.0") 'license:asl2.0)
|
||||
(_ 'unknown-license!))))
|
||||
|
||||
(define (php-package? package)
|
||||
"Return true if PACKAGE is a PHP package from Packagist."
|
||||
(and
|
||||
(eq? (package-build-system package) composer-build-system)
|
||||
(string-prefix? "php-" (package-name package))))
|
||||
|
||||
(define (latest-release package)
|
||||
"Return an <upstream-source> for the latest release of PACKAGE."
|
||||
(let* ((php-name (guix-package->composer-name package))
|
||||
(package (composer-fetch php-name))
|
||||
(version (composer-package-version package))
|
||||
(url (composer-source-url (composer-package-source package))))
|
||||
(upstream-source
|
||||
(package (package-name package))
|
||||
(version version)
|
||||
(urls (list url)))))
|
||||
|
||||
(define %composer-updater
|
||||
(upstream-updater
|
||||
(name 'composer)
|
||||
(description "Updater for Composer packages")
|
||||
(pred php-package?)
|
||||
(import latest-release)))
|
||||
|
||||
(define* (composer-recursive-import package-name #:optional version)
|
||||
(recursive-import package-name
|
||||
#:version version
|
||||
#:repo->guix-package composer->guix-package
|
||||
#:guix-name php-package-name))
|
||||
@ -55,6 +55,10 @@
|
||||
#:use-module (guix sets)
|
||||
#:export (%input-style
|
||||
|
||||
%bioconductor-version
|
||||
download
|
||||
fetch-description
|
||||
|
||||
cran->guix-package
|
||||
bioconductor->guix-package
|
||||
cran-recursive-import
|
||||
|
||||
@ -47,7 +47,7 @@
|
||||
|
||||
(define importers '("gnu" "pypi" "cpan" "hackage" "stackage" "egg" "elpa"
|
||||
"gem" "go" "cran" "crate" "texlive" "json" "opam"
|
||||
"minetest" "elm" "hexpm"))
|
||||
"minetest" "elm" "hexpm" "composer"))
|
||||
|
||||
(define (resolve-importer name)
|
||||
(let ((module (resolve-interface
|
||||
|
||||
107
guix/scripts/import/composer.scm
Normal file
107
guix/scripts/import/composer.scm
Normal file
@ -0,0 +1,107 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2015 David Thompson <davet@gnu.org>
|
||||
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (guix scripts import composer)
|
||||
#:use-module (guix ui)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix scripts)
|
||||
#:use-module (guix import composer)
|
||||
#:use-module (guix scripts import)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-11)
|
||||
#:use-module (srfi srfi-37)
|
||||
#:use-module (srfi srfi-41)
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module (ice-9 format)
|
||||
#:export (guix-import-composer))
|
||||
|
||||
|
||||
;;;
|
||||
;;; Command-line options.
|
||||
;;;
|
||||
|
||||
(define %default-options
|
||||
'())
|
||||
|
||||
(define (show-help)
|
||||
(display (G_ "Usage: guix import composer PACKAGE-NAME
|
||||
Import and convert the Composer package for PACKAGE-NAME.\n"))
|
||||
(display (G_ "
|
||||
-h, --help display this help and exit"))
|
||||
(display (G_ "
|
||||
-V, --version display version information and exit"))
|
||||
(display (G_ "
|
||||
-r, --recursive generate package expressions for all Composer packages\
|
||||
that are not yet in Guix"))
|
||||
(newline)
|
||||
(show-bug-report-information))
|
||||
|
||||
(define %options
|
||||
;; Specification of the command-line options.
|
||||
(cons* (option '(#\h "help") #f #f
|
||||
(lambda args
|
||||
(show-help)
|
||||
(exit 0)))
|
||||
(option '(#\V "version") #f #f
|
||||
(lambda args
|
||||
(show-version-and-exit "guix import composer")))
|
||||
(option '(#\r "recursive") #f #f
|
||||
(lambda (opt name arg result)
|
||||
(alist-cons 'recursive #t result)))
|
||||
%standard-import-options))
|
||||
|
||||
|
||||
;;;
|
||||
;;; Entry point.
|
||||
;;;
|
||||
|
||||
(define (guix-import-composer . args)
|
||||
(define (parse-options)
|
||||
;; Return the alist of option values.
|
||||
(args-fold* args %options
|
||||
(lambda (opt name arg result)
|
||||
(leave (G_ "~A: unrecognized option~%") name))
|
||||
(lambda (arg result)
|
||||
(alist-cons 'argument arg result))
|
||||
%default-options))
|
||||
|
||||
(let* ((opts (parse-options))
|
||||
(args (filter-map (match-lambda
|
||||
(('argument . value)
|
||||
value)
|
||||
(_ #f))
|
||||
(reverse opts))))
|
||||
(match args
|
||||
((package-name)
|
||||
(if (assoc-ref opts 'recursive)
|
||||
(map (match-lambda
|
||||
((and ('package ('name name) . rest) pkg)
|
||||
`(define-public ,(string->symbol name)
|
||||
,pkg))
|
||||
(_ #f))
|
||||
(composer-recursive-import package-name))
|
||||
(let ((sexp (composer->guix-package package-name)))
|
||||
(unless sexp
|
||||
(leave (G_ "failed to download meta-data for package '~a'~%")
|
||||
package-name))
|
||||
sexp)))
|
||||
(()
|
||||
(leave (G_ "too few arguments~%")))
|
||||
((many ...)
|
||||
(leave (G_ "too many arguments~%"))))))
|
||||
88
tests/composer.scm
Normal file
88
tests/composer.scm
Normal file
@ -0,0 +1,88 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (test-composer)
|
||||
#:use-module (guix import composer)
|
||||
#:use-module (guix base32)
|
||||
#:use-module (gcrypt hash)
|
||||
#:use-module (guix tests http)
|
||||
#:use-module (guix grafts)
|
||||
#:use-module (srfi srfi-64)
|
||||
#:use-module (web client)
|
||||
#:use-module (ice-9 match))
|
||||
|
||||
;; Globally disable grafts because they can trigger early builds.
|
||||
(%graft? #f)
|
||||
|
||||
(define test-json
|
||||
"{
|
||||
\"packages\": {
|
||||
\"foo/bar\": {
|
||||
\"0.1\": {
|
||||
\"name\": \"foo/bar\",
|
||||
\"description\": \"description\",
|
||||
\"keywords\": [\"testing\"],
|
||||
\"homepage\": \"http://example.com\",
|
||||
\"version\": \"0.1\",
|
||||
\"license\": [\"BSD-3-Clause\"],
|
||||
\"source\": {
|
||||
\"type\": \"url\",
|
||||
\"url\": \"http://example.com/Bar-0.1.tar.gz\"
|
||||
},
|
||||
\"require\": {},
|
||||
\"require-dev\": {\"phpunit/phpunit\": \"1.0.0\"}
|
||||
}
|
||||
}
|
||||
}
|
||||
}")
|
||||
|
||||
(define test-source
|
||||
"foobar")
|
||||
|
||||
(test-begin "composer")
|
||||
|
||||
(test-assert "composer->guix-package"
|
||||
;; Replace network resources with sample data.
|
||||
(with-http-server `((200 ,test-json)
|
||||
(200 ,test-source))
|
||||
(parameterize ((%composer-base-url (%local-url))
|
||||
(current-http-proxy (%local-url)))
|
||||
(match (composer->guix-package "foo/bar")
|
||||
(`(package
|
||||
(name "php-foo-bar")
|
||||
(version "0.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri "http://example.com/Bar-0.1.tar.gz")
|
||||
(sha256
|
||||
(base32
|
||||
,(? string? hash)))))
|
||||
(build-system composer-build-system)
|
||||
(native-inputs (list php-phpunit-phpunit))
|
||||
(synopsis "")
|
||||
(description "description")
|
||||
(home-page "http://example.com")
|
||||
(license license:bsd-3))
|
||||
(string=? (bytevector->nix-base32-string
|
||||
(call-with-input-string test-source port-sha256))
|
||||
hash))
|
||||
(x
|
||||
(pk 'fail x #f))))))
|
||||
|
||||
(test-end "composer")
|
||||
Loading…
x
Reference in New Issue
Block a user