branch master updated: website: Add post about using glibc-hwcaps.
This is an automated email from the git hooks/post-receive script. efraim pushed a commit to branch master in repository guix-artwork. The following commit(s) were added to refs/heads/master by this push: new 787bae9 website: Add post about using glibc-hwcaps. 787bae9 is described below commit 787bae9f8ef3b9db98dad60f50511e0b7d3fc46e Author: Efraim Flashner AuthorDate: Sun Jan 14 10:17:54 2024 +0200 website: Add post about using glibc-hwcaps. * website/posts/guix-packages-with-glibc-hwcaps.md: New file. --- website/posts/guix-packages-with-glibc-hwcaps.md | 183 +++ 1 file changed, 183 insertions(+) diff --git a/website/posts/guix-packages-with-glibc-hwcaps.md b/website/posts/guix-packages-with-glibc-hwcaps.md new file mode 100644 index 000..1d9cc16 --- /dev/null +++ b/website/posts/guix-packages-with-glibc-hwcaps.md @@ -0,0 +1,183 @@ +title: Building packages targeting psABIs +author: Efraim Flashner +tags: Packaging +date: 2024-01-14 12:00:00 +--- + +Starting with version 2.33, the GNU C library (glibc) grew the capability to +search for shared libraries using additional paths, based on the hardware +capabilities of the machine running the code. This was a great boon for +x86_64, which was first released in 2003, and has seen many changes in the +capabilities of the hardware since then. While it is extremely common for +Linux distributions to compile for a baseline which encompasses all of an +architecture, there is performance being left on the table by targeting such an +old specification and not one of the newer revisions. + +One option used internally in glibc and in some other performance-critical +libraries is [indirect functions, or +IFUNCs](https://sourceware.org/glibc/wiki/GNU_IFUNC) (see also +[here](https://hpc.guix.info/blog/2018/01/pre-built-binaries-vs-performance/)) +The loader, `ld.so` uses them to pick function implementations optimized for +the available CPU at load time. GCC's (functional multi-versioning +(FMV))[https://gcc.gnu.org/wiki/FunctionMultiVersioning] generates several +optimized versions of functions, using the IFUNC mechanism so the approprate +one is selected at load time. These are strategies which most +performance-sensitive libraries do, but not all of them. + +With the `--tune` using [package +transformation](https://guix.gnu.org/en/manual/devel/en/html_node/Package-Transformation-Options.html) +option, Guix implements so-called [package +multi-versioning](https://hpc.guix.info/blog/2018/01/pre-built-binaries-vs-performance/), +which creates package variants using compiler flags set to use optimizations +targeted for a specific CPU. + +Finally - and we're getting to the central topic of this post! - glibc since +version 2.33 supports another approach: `ld.so` would search not just the +`/lib` folder, but also the `glibc-hwcaps` folders, which for x86_64 included +`/lib/glibc-hwcaps/x86-64-v2`, `/lib/glibc-hwcaps/x86-64-v3` and +`/lib/glibc-hwcaps/x86-64-v4`, corresponding to the psABI micro-architectures +of the x86_64 architecture. This means that if a library was compiled against +the baseline of the architecture then it should be installed in `/lib`, but if +it were compiled a second time, this time using (depending on the build +instructions) `-march=x86-64-v2`, then the libraries could be installed in +`/lib/glibc-hwcaps/x86-64-v2` and then glibc, using `ld.so`, would choose the +correct library at runtime. + +These micro-architectures aren't a perfect match for the different hardware +available, it is often the case that a particular CPU would satisfy the +requirements of one tier and part of the next but would therefore only be able +to use the optimizations provided by the first tier and not by the added +features that the CPU also supports. + +This of course shouldn't be a problem in Guix; it's possible, and even +encouraged, to adjust packages to be more useful for one's needs. The problem +comes from the search paths: `ld.so` will only search for the `glibc-hwcaps` +directory if it has already found the base library in the preceding `/lib` +directory. This isn't a problem for distributions following the File System +Hierarchy (FHS), but for Guix we will need to ensure that all the different +versions of the library will be in the same output. + +With a little bit of planning this turns out to not be as hard as it sounds. +Lets take for example, the [GNU Scientific +Library](https://www.gnu.org/software/gsl/), gsl, a math library which helps +with all sorts of numerical analysis. First we create a procedure to generate +our 3 additional packages, corresponding to the psABIs that are searched for in +the `glibc-hwcaps` directory. + +``` scheme +(define (gsl-hwabi psabi) + (package/inherit gsl +(name (string-append "gsl-" psabi)) +(arguments + (substitute-keyword-arguments (package-arguments gsl) + ((#:make-flags flags #~'()) +#~(append (list (string-append &quo
branch master updated: sysadmin: build-machines: Use tmpfs for /var/guix/temproots.
This is an automated email from the git hooks/post-receive script. efraim pushed a commit to branch master in repository maintenance. The following commit(s) were added to refs/heads/master by this push: new 0e62b86 sysadmin: build-machines: Use tmpfs for /var/guix/temproots. 0e62b86 is described below commit 0e62b8664e96e78e324240eb55a13b13268471e7 Author: Efraim Flashner AuthorDate: Sun Oct 1 10:47:24 2023 +0300 sysadmin: build-machines: Use tmpfs for /var/guix/temproots. * hydra/modules/sysadmin/build-machines.scm (build-machine-os) [file-systems]: Add tmpfs file-system for /var/guix/temproots. --- hydra/modules/sysadmin/build-machines.scm | 16 +++- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/hydra/modules/sysadmin/build-machines.scm b/hydra/modules/sysadmin/build-machines.scm index a37726b..a7caef8 100644 --- a/hydra/modules/sysadmin/build-machines.scm +++ b/hydra/modules/sysadmin/build-machines.scm @@ -64,11 +64,17 @@ HOST-NAME and accessibly by SYSADMINS, with the given AUTHORIZED-GUIX-KEYS." (bootloader (bootloader-configuration (bootloader grub-bootloader) (target "/dev/sda"))) -(file-systems (cons (file-system - (device (file-system-label "my-root")) - (mount-point "/") - (type "ext4")) -%base-file-systems)) +(file-systems (cons* (file-system + (device (file-system-label "my-root")) + (mount-point "/") + (type "ext4")) + (file-system + (device "tmpfs") + (mount-point "/var/guix/temproots") + (type "tmpfs") + (flags '(no-suid no-dev no-exec)) + (check? #f)) + %base-file-systems)) (services (cons* (service sysadmin-service-type sysadmins) (service openssh-service-type)
branch master updated: hydra: berlin: Add Efraim Flashner as a sysadmin.
This is an automated email from the git hooks/post-receive script. efraim pushed a commit to branch master in repository maintenance. The following commit(s) were added to refs/heads/master by this push: new 086e95d hydra: berlin: Add Efraim Flashner as a sysadmin. 086e95d is described below commit 086e95d5e127d8ce32d28c92790d7f4af7d19de1 Author: Efraim Flashner AuthorDate: Tue May 23 10:25:49 2023 +0300 hydra: berlin: Add Efraim Flashner as a sysadmin. * hydra/berlin.scm (%sysadmins): Add Efraim Flashner. --- hydra/berlin.scm | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hydra/berlin.scm b/hydra/berlin.scm index 9e036ef..e5aa73d 100644 --- a/hydra/berlin.scm +++ b/hydra/berlin.scm @@ -63,7 +63,10 @@ (ssh-public-key (local-file "keys/ssh/maxim.pub"))) (sysadmin (name "arunisaac") (full-name "Arun Isaac") - (ssh-public-key (local-file "keys/ssh/arunisaac.pub") + (ssh-public-key (local-file "keys/ssh/arunisaac.pub"))) +(sysadmin (name "efraim") + (full-name "Efraim Flashner") + (ssh-public-key (local-file "keys/ssh/efraim.pub" (include "nginx/berlin.scm") (include "website.scm")
branch master updated: talks: packaging-con: Add efraims talk
This is an automated email from the git hooks/post-receive script.
efraim pushed a commit to branch master
in repository maintenance.
The following commit(s) were added to refs/heads/master by this push:
new 474f2aa talks: packaging-con: Add efraims talk
474f2aa is described below
commit 474f2aa124a5b5b93475dce244322d89a6b4236b
Author: Efraim Flashner
AuthorDate: Tue Dec 7 16:43:05 2021 +0200
talks: packaging-con: Add efraims talk
---
.../adventures-rust-progs/talk.rst | 364 +
1 file changed, 364 insertions(+)
diff --git a/talks/packaging-con-2021/adventures-rust-progs/talk.rst
b/talks/packaging-con-2021/adventures-rust-progs/talk.rst
new file mode 100644
index 000..519b3bb
--- /dev/null
+++ b/talks/packaging-con-2021/adventures-rust-progs/talk.rst
@@ -0,0 +1,364 @@
+Packaging Rust crates in GNU Guix
+=
+|
+
+.. figlet:: How hard could it possibly be?
+
+About me
+
+|
+
+* Guix contributor since 2015
+* First Rust related commit December 2017
+* Primarily interested in distro maintenance
+
+ * Watching packages compile is soothing
+* Part of my $DAYJOB is maintaining some Rust packages using Guix
+
+Quick history of Rust and GNU Guix
+==
+|
+
+* First stable Rust release May 2015
+* First Rust related packaging bits in December 2016
+
+ * (guix import crate foo)
+ * 'Blessed Bootstrap Binaries' and 'rustc' package
+ * 'cargo-build-system' added
+* 'cargo' added in April 2017
+* 'mrustc' added in April 2018
+
+ * Use 'mrustc' for bootstrap path, September 2018
+ * 'Blessed Bootstrap Binaries' removed
+* Add rust to icecat build, September 2018, Icecat-60.2.0
+* First crate added in April 2019
+* First 'rust app', rust-cbindgen, added October 2019, used for Icecat-68
+* First package to mix cargo-build-system with standard C code
+
+ * librsvg-next, March 2020
+ * Mixed rust code and C/C++ code, needs mixed build system
+* Install crates and source for later use, February 2021
+
+ * $PREFIX/share/cargo{registry,src}
+
+Looking at a standard package
+=
+|
+
+.. code:: shell
+
+tree $(guix build sqlite)
+
+|
+
+.. code::
+
+/gnu/store/g9gf1ndxryjc15mrjiy41w162lx8j6cv-sqlite-3.32.3
+├── bin
+│ └── sqlite3
+├── include
+│ ├── sqlite3ext.h
+│ └── sqlite3.h
+├── lib
+│ ├── libsqlite3.la
+│ ├── libsqlite3.so -> libsqlite3.so.0.8.6
+│ ├── libsqlite3.so.0 -> libsqlite3.so.0.8.6
+│ ├── libsqlite3.so.0.8.6
+│ └── pkgconfig
+│ └── sqlite3.pc
+└── share
+└── man
+└── man1
+└── sqlite3.1.gz
+/gnu/store/nhwgg7zbvqijwxi8djqqv5hmd940vqa1-sqlite-3.32.3-static
+└── lib
+└── libsqlite3.a
+
+8 directories, 10 files
+
+Looking at a rust package - pre February 2021
+=
+
+.. container:: handout
+
+ This output needs to be refreshed
+ pre commit 4d00185d66c9bd047dfe3077ed89a6a6129429ee
+
+|
+
+.. code:: shell
+
+tree $(guix build rust-rand@0.6)
+
+|
+
+.. code::
+
+/gnu/store/gx7lr6c45irpig0cy1wc36gasfh3yfic-rust-rand-0.6.5
+└── share
+└── doc
+└── rust-rand-0.6.5
+├── LICENSE-APACHE
+└── LICENSE-MIT
+
+Looking at a rust package now
+=
+
+.. container:: handout
+
+ This output needs to be refreshed
+ post commit 4d00185d66c9bd047dfe3077ed89a6a6129429ee
+
+|
+
+.. code:: shell
+
+tree $(guix build rust-rand@0.6)
+
+.. code::
+
+ /gnu/store/rvapywikakqwcby1qlz58h8rx8r6asv9-rust-rand-0.6.5
+ └── share
+ ├── cargo
+ │ ├── registry
+ │ │ └── rand-0.6.5.crate
+ │ └── src
+ │ └── rand-0.6.5
+ │ ├── benches
+ │ │ ├── distributions.rs
+ │ │ ├── generators.rs
+ │ │ ├── misc.rs
+ │ │ └── seq.rs
+ │ ├── build.rs
+ ...
+ └── doc
+ └── rust-rand-0.6.5
+ ├── LICENSE-APACHE
+ └── LICENSE-MIT
+
+|
+
+A crate package definition:
+===
+|
+
+.. code:: shell
+
+guix import crate rand@0.6
+
+.. code:: scheme
+
+ (define-public rust-rand-0.6
+(package
+ (name "rust-rand")
+ (version "0.6.5")
+ (source ...)
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-autocfg" ,rust-autocfg-0.1)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-packed-simd" ,rust-packed-simd-0.3)
+ ("rust-rand-chacha" ,rust-rand-chacha-0.1)
+ ("rust-rand-core" ,rust-rand-core-0.4)
+
branch master updated: backgrounds: New desktop backgrounds.
This is an automated email from the git hooks/post-receive script. efraim pushed a commit to branch master in repository guix-artwork. The following commit(s) were added to refs/heads/master by this push: new f1c758d backgrounds: New desktop backgrounds. f1c758d is described below commit f1c758d8bf138fbbf827dbbd2080e5dd8d7ec2c9 Author: sirgazil AuthorDate: Sun Feb 23 15:21:11 2020 -0500 backgrounds: New desktop backgrounds. * backgrounds/guix-checkered-16-9.svg * backgrounds/guix-encircled-checkered-16-9.svg * backgrounds/guix-silver-checkered-16-9.svg * backgrounds/guix-silver-encircled-checkered-16-9.svg --- backgrounds/guix-checkered-16-9.svg| 322 + backgrounds/guix-encircled-checkered-16-9.svg | 533 + backgrounds/guix-silver-checkered-16-9.svg | 307 .../guix-silver-encircled-checkered-16-9.svg | 530 4 files changed, 1692 insertions(+) diff --git a/backgrounds/guix-checkered-16-9.svg b/backgrounds/guix-checkered-16-9.svg new file mode 100644 index 000..719364d --- /dev/null +++ b/backgrounds/guix-checkered-16-9.svg @@ -0,0 +1,322 @@ + + + +http://purl.org/dc/elements/1.1/; + xmlns:cc="http://creativecommons.org/ns#; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg="http://www.w3.org/2000/svg; + xmlns="http://www.w3.org/2000/svg; + xmlns:xlink="http://www.w3.org/1999/xlink; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape; + width="1920" + height="1080" + id="svg2" + version="1.1" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" + sodipodi:docname="guix-checkered-16-9.svg" + inkscape:export-filename="guix-checkered.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +image/svg+xml +http://purl.org/dc/dcmitype/StillImage; /> + +2020-02-23 + + +sirgazil + + + + +sirgazil + + +en + + + + + +http://creativecommons.org/publicdomain/zero/1.0/; /> +This background is for 16:9 displays. + +This image is dedicated to the public domain, except for the Guix logo, which can be used under the Creative Commons Attribution-ShareAlike 4.0 International License. + + http://creativecommons.org/publicdomain/zero/1.0/;> +http://creativecommons.org/ns#Reproduction; /> +http://creativecommons.org/ns#Distribution; /> +http://creativecommons.org/ns#DerivativeWorks; /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/backgrounds/guix-encircled-checkered-16-9.svg b/backgrounds/guix-encircled-checkered-16-9.svg new file mode 100644 index 000..bb28fcf --- /dev/null +++ b/backgrounds/guix-encircled-checkered-16-9.svg @@ -0,0 +1,533 @@ + + + +http://purl.org/dc/elements/1.1/; + xmlns:cc="http://creativecommons.org/ns#; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg="http://www.w3.org/2000/svg; + xmlns="http://www.w3.org/2000/svg; + xmlns:xlink="http://www.w3.org/1999/xlink; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape; + width="1920" + height="1080" + id="svg2" + version="1.1" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" + sodipodi:docname="guix-encircled-checkered-16-9.svg" + inkscape:export-filename="guix-encircled-checkered.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +image/svg+xml +http://purl.org/dc/dcmitype/StillImage; /> + +2020-02-23 + + +sirgazil + + + + +sirgazil + + +en + + + + + +http://creativecommons.org/publicdomain/zero/1.0/; /> +This background is for 16:9 displays. + +This image is dedicated to the public domain, except for the Guix
branch master updated: website: Add post about shepherd user services
This is an automated email from the git hooks/post-receive script.
efraim pushed a commit to branch master
in repository guix-artwork.
The following commit(s) were added to refs/heads/master by this push:
new 17fd2bc website: Add post about shepherd user services
17fd2bc is described below
commit 17fd2bc147b612556300cf8435cf74edb54c62a0
Author: Efraim Flashner
AuthorDate: Sun May 17 22:16:29 2020 +0300
website: Add post about shepherd user services
---
website/posts/gnu-shepherd-user-services.md | 230
1 file changed, 230 insertions(+)
diff --git a/website/posts/gnu-shepherd-user-services.md
b/website/posts/gnu-shepherd-user-services.md
new file mode 100644
index 000..aff914b
--- /dev/null
+++ b/website/posts/gnu-shepherd-user-services.md
@@ -0,0 +1,230 @@
+/* vim: set filetype=text : */
+title: GNU Shepherd user services
+date: 2020-05-17 20:00:00
+author: Efraim Flashner
+slug: gnu-shepherd-user-services
+tags: Scheme API, shepherd
+---
+
+One of the things which sets Guix apart from other GNU/Linux
+distributions is that it uses [GNU
+Shepherd](https://www.gnu.org/software/shepherd/) instead of the now
+ubiquitous systemd. A side effect of this is that user systemd units do
+not work on Guix System. Love, hate or extremely ambivalent toward
+systemd, this means that users cannot rely on already written systemd
+unit files for their regular user-level services.
+
+There are a couple of benefits to using GNU Shepherd, and not all of
+them are due to it already being installed on Guix. Becoming comfortable
+with using Shepherd and understanding how to write and edit Shepherd
+service configurations makes the transition from other GNU/Linux
+distributions to Guix System easier. More complex services with their
+own logic tree, using the full power of [GNU
+Guile](https://www.gnu.org/software/guile/), are also possible. This
+means you can have one service that behaves differently if it's running
+on a different system or architecture without needing to call out to
+shell scripts or using minimally different service definitions.
+
+The GNU Shepherd manual
+[suggests](https://www.gnu.org/software/shepherd/manual/html_node/Jump-Start.html#index-Configuration-file)
+putting all the services inside a
+monolithic `init.scm` file, located by default at
+`$XDG_CONFIG_DIR/shepherd/init.scm`. While this does make it easy to keep
+everything in one place, it does create one glaring issue: any changes
+to the file mean that all the services need to be stopped and restarted
+in order for any changes to take place.
+
+Luckily there's a nice function called `scandir` hiding in [`ice-9
+ftw`](https://www.gnu.org/software/guile/manual/html_node/File-Tree-Walk.html#index-scandir)
+which returns a list of all files in a specified directory (with options
+for narrowing down the list or sorting it). This means that our `init.scm`
+can contain a minimum of code and all actual services can be loaded from
+individual files.
+
+First the minimal `init.scm`:
+
+```scheme
+(use-modules (shepherd service)
+ ((ice-9 ftw) #:select (scandir)))
+
+;; Load all the files in the directory 'init.d' with a suffix '.scm'.
+(for-each
+ (lambda (file)
+(load (string-append "init.d/" file)))
+ (scandir (string-append (dirname (current-filename)) "/init.d")
+ (lambda (file)
+ (string-suffix? ".scm" file
+
+;; Send shepherd into the background
+(action 'shepherd 'daemonize)
+```
+
+Let's take a sample service for running syncthing, as defined in
+`$XDG_CONFIG_DIR/shepherd/init.d/syncthing.scm`:
+```scheme
+(define syncthing
+ (make
+#:provides '(syncthing)
+#:docstring "Run `syncthing' without calling the browser"
+#:start (make-forkexec-constructor
+ '("syncthing" "-no-browser")
+ #:log-file (string-append (getenv "HOME")
+"/log/syncthing.log"))
+#:stop (make-kill-destructor)
+#:respawn? #t))
+(register-services syncthing)
+
+(start syncthing)
+```
+
+As with any other shepherd service it is defined and registered, and in
+this case it will start automatically. When the file is loaded by
+shepherd after being discovered by scandir everything works exactly as
+though the service definition were located directly inside the `init.scm`.
+
+Now lets make a change. Since syncthing already has a `-logfile` flag and
+it has built-in log rotation that sounds better than using shepherd's
+`#:log-file` option. First we'll make our changes to the service:
+
+```scheme
+(define syncthing
+ (make
+#:provides '(syncthing)
+#:docstring "Run `syncthing' without calling the browser"
+#:start (make-forkexec-constructor
+ '("syncthing" "-no-browser"
+"-logflags=3" ; prefix with date & time
+&qu
01/02: talks: fosdem-2020: Add "guix-containers-on-foreign-distro" talk.
efraim pushed a commit to branch master in repository maintenance. commit bc9abea88fd9ddadd5b64b3a91a1106d1069a35a Author: Efraim Flashner AuthorDate: Tue Feb 4 12:22:22 2020 +0200 talks: fosdem-2020: Add "guix-containers-on-foreign-distro" talk. * talks/fosdem-2020/guix-containers-on-foreign-distro: New directory. --- .../guix-containers-on-foreign-distro/HPC-talk.rst | 412 + .../presentty.scm | 113 ++ 2 files changed, 525 insertions(+) diff --git a/talks/fosdem-2020/guix-containers-on-foreign-distro/HPC-talk.rst b/talks/fosdem-2020/guix-containers-on-foreign-distro/HPC-talk.rst new file mode 100644 index 000..477bba2 --- /dev/null +++ b/talks/fosdem-2020/guix-containers-on-foreign-distro/HPC-talk.rst @@ -0,0 +1,412 @@ +Guix Containers for HPC +=== +| + +.. figlet:: I don't want THAT running on MY server ! + +About me + +| + +* Guix contributor since 2015 +* Work with the University of Tennessee +* Based on a true story +* I'm here representing myself + +Based on actual events +== +.. hidetitle:: +.. cowsay:: NO SCIENTISTS WERE INJURED FOR THIS PRESENTATION OR FOR YOUR ENJOYMENT +.. figlet:: I PROMISE + +Pithy Title +=== +.. hidetitle:: + +| I was working from home quietly as I often do and boss-man +| tells me we have a new webapp we want to host on the server. + +THE NEW WEBAPP +== +| + +* It uses PHP, Python and Octave +* PHP + + * The server it's running on now has php-5.3.3 + * Released back in July 2011 + * 5.3.x EOL since July 2016 +* Python + + * It's using Python-2.4 + * And another Python from the user's home directory +* Octave + + * From 2010 + + +Oh, one more thing... += +| + +.. cowsay:: it accepts arbitrary files from users on the Internet + +First some things about Guix + +| +| Functional Package Management: +| +| Each package depends on the specific packages +| it's built against. Changing any one of them +| results in a new package. + +.. cowsay:: I'm the sum-total of all my cow ancestors. + +First some things about Guix + +| +| Functional Profile Management: +| +| The profile of packages gets rebuilt on each change. + +.. cowsay:: It's like someone straightens the grass I previously trampled right before I come out of the barn. + +First some things about Guix + +| +| Functional System Management: +| +| You can declare a whole operating system +| (or container!) +| which does not depend on previous iterations. + +.. cowsay:: Help! I'm a cow in a box! Completely different than the last time I was in a box! + +Back to the new webapp +== +| + +* It uses PHP, Python and Octave +* PHP + + * The server it's running on now has php-5.3.3 + * Released since July 2011 + * 5.3.x EOL since July 2016 +* Python + + * It's using Python-2.4 + * And another Python from the user's home directory +* Octave + + * From 2010 + +Nothing inside that you didn't intend += +| + +.. code:: + +WARNING: [pool www] child 26 said into stderr: "./run.sh: line 19: rm: command not found" +WARNING: [pool www] child 26 said into stderr: "./run.sh: line 20: rmdir: command not found" +WARNING: [pool www] child 26 said into stderr: "sh: ./run_scripts/run_octave: Permission denied" +WARNING: [pool www] child 27 said into stderr: "./run.sh: line 2: dirname: command not found" +WARNING: [pool www] child 27 said into stderr: "./run.sh: line 7: mkdir: command not found" + +Time to build some packages like its 2010 += +| +| + +.. code:: + +@ @ +@ @ @ @ +@ python2-2.4.6 @ @ glpk-4.48 @ +@ @ @ @ +@ @ +| | +| | +| | + \|/ \|/ +@ @ +@ @ @ @ +@ graphviz-2.26 @ @ octave-3.4.3 @ +@ @ @ @ +@ @ +\ / + \ / + \| |/ + @ + @ @ + @ BNW @ + @ @ + @ + +GRAPHVIZ-2.26 += +| + +.. code:: scheme + +(define-public graphviz-2.26 + (package +(inherit graphviz) +(na
02/02: talks: fosdem-2020: Add "rust-in-guix" talk.
efraim pushed a commit to branch master
in repository maintenance.
commit 6ed66a5f5e91a91fa66967749d61c2b57af6626d
Author: Efraim Flashner
AuthorDate: Tue Feb 4 12:24:03 2020 +0200
talks: fosdem-2020: Add "rust-in-guix" talk.
* talks/fosdem-2020/rust-in-guix: New directory.
---
talks/fosdem-2020/rust-in-guix/Rust-talk.rst | 406 +++
talks/fosdem-2020/rust-in-guix/presentty.scm | 113
2 files changed, 519 insertions(+)
diff --git a/talks/fosdem-2020/rust-in-guix/Rust-talk.rst
b/talks/fosdem-2020/rust-in-guix/Rust-talk.rst
new file mode 100644
index 000..49585c6
--- /dev/null
+++ b/talks/fosdem-2020/rust-in-guix/Rust-talk.rst
@@ -0,0 +1,406 @@
+Packaging Rust crates in GNU Guix
+=
+|
+
+.. figlet:: How hard could it possibly be?
+
+About me
+
+|
+
+* Guix contributor since 2015
+* First Rust related commit December 2017
+* Primarily interested in distro maintenance
+
+ * Watching packages compile is soothing
+
+Quick overlapping history of Rust and GNU Guix
+==
+|
+
+* First stable Rust release May 2015
+* Crate importer added in December 2016
+
+ * (guix import crate foo)
+* 'Blessed Bootstrap Binaries' and 'rustc' package added in December 2016
+
+ * i686-linux and x86_64-linux only
+ * version 1.12.1
+ * 'cargo-build-system' added
+* 'cargo' added in April 2017.
+* 'Blessed Bootstrap Binaries' added for all systems supported in Guix.
+
+ * December 2017
+ * (This was me, I like when packages build)
+* 'mrustc' added in April 2018.
+* Use 'mrustc' for bootstrap path, September 2018
+
+ * 'Blessed Bootstrap Binaries' removed.
+* Add rust to icecat build, September 2018. Icecat-60.2.0
+* First crate added, rust-unicode-xid. April 2019.
+* First 'rust app', rust-cbindgen, added October 2019. Used for Icecat-68.
+
+Looking at a standard package
+=
+|
+
+.. code:: shell
+
+tree $(guix build sqlite)
+
+|
+
+.. code::
+
+/gnu/store/i6l1579g80387rda658jy9cfqq82643d-sqlite-3.28.0
+|-- bin
+| `-- sqlite3
+|-- include
+| |-- sqlite3.h
+| `-- sqlite3ext.h
+|-- lib
+| |-- libsqlite3.a
+| |-- libsqlite3.la
+| |-- libsqlite3.so -> libsqlite3.so.0.8.6
+| |-- libsqlite3.so.0 -> libsqlite3.so.0.8.6
+| |-- libsqlite3.so.0.8.6
+| `-- pkgconfig
+| `-- sqlite3.pc
+`-- share
+`-- man
+`-- man1
+`-- sqlite3.1.gz
+
+Looking at a rust package
+=
+|
+
+.. code:: shell
+
+tree $(guix build rust-rand@0.6)
+
+|
+
+.. code::
+
+/gnu/store/gx7lr6c45irpig0cy1wc36gasfh3yfic-rust-rand-0.6.5
+`-- share
+`-- doc
+`-- rust-rand-0.6.5
+|-- LICENSE-APACHE
+`-- LICENSE-MIT
+
+The Crate.toml
+==
+|
+
+.. code:: toml
+
+[package]
+name = "rand"
+version = "0.6.5"
+authors = ["The Rand Project Developers", "The Rust Project Developers"]
+license = "MIT/Apache-2.0"
+readme = "README.md"
+repository = "https://github.com/rust-random/rand;
+documentation = "https://rust-random.github.io/rand;
+homepage = "https://crates.io/crates/rand;
+description = """
+Random number generators and other randomness functionality.
+"""
+keywords = ["random", "rng"]
+categories = ["algorithms", "no-std"]
+build = "build.rs"
+ ...
+[dependencies]
+rand_core = { path = "rand_core", version = "0.4" }
+rand_pcg = { path = "rand_pcg", version = "0.1" }
+rand_jitter = { path = "rand_jitter", version = "0.1" }
+rand_os = { path = "rand_os", version = "0.1", optional = true }
+# only for deprecations and benches:
+rand_isaac = { path = "rand_isaac", version = "0.1" }
+rand_chacha = { path = "rand_chacha", version = "0.1" }
+rand_hc = { path = "rand_hc", version = "0.1" }
+rand_xorshift = { path = "rand_xorshift", version = "0.1" }
+log = { version = "0.4", optional = true }
+
+Let's hit the API
+=
+|
+
+.. code:: shell
+
+curl https://crates.io/api/v1/crates/rand/0.6.5
+
+|
+
+.. code:: json
+
+{"version":
+ {"id":130460,
+ "crate":"rand",
+ "num":"0.6.5",
+ "dl_path":"/api/v1/crates/rand/0.6.5/download",
+ "readme_path":"/api/v1/crates/rand/0.6.5/readme",
+ "updated_at":"
branch master updated (0476cd6 -> 6ed66a5)
efraim pushed a change to branch master in repository maintenance. from 0476cd6 talks: fosdem-2020/guix-jupyter: Add PDF. new bc9abea talks: fosdem-2020: Add "guix-containers-on-foreign-distro" talk. new 6ed66a5 talks: fosdem-2020: Add "rust-in-guix" talk. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../guix-containers-on-foreign-distro/HPC-talk.rst | 412 + .../presentty.scm | 113 ++ talks/fosdem-2020/rust-in-guix/Rust-talk.rst | 406 talks/fosdem-2020/rust-in-guix/presentty.scm | 113 ++ 4 files changed, 1044 insertions(+) create mode 100644 talks/fosdem-2020/guix-containers-on-foreign-distro/HPC-talk.rst create mode 100644 talks/fosdem-2020/guix-containers-on-foreign-distro/presentty.scm create mode 100644 talks/fosdem-2020/rust-in-guix/Rust-talk.rst create mode 100644 talks/fosdem-2020/rust-in-guix/presentty.scm
branch master updated (893ec90 -> a3ea535)
efraim pushed a change to branch master in repository guix-artwork. from 893ec90 website: help: Add links to the Russian and Simplified Chinese translations. new a3ea535 website: Add custom-kernel post. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: website/posts/custom-kernel.md | 275 + 1 file changed, 275 insertions(+) create mode 100644 website/posts/custom-kernel.md
01/01: website: Add custom-kernel post.
efraim pushed a commit to branch master
in repository guix-artwork.
commit a3ea535da9293368af03025a3e4114c746a862fb
Author: Efraim Flashner
Date: Mon May 20 20:39:08 2019 +0300
website: Add custom-kernel post.
* website/posts/custom-kernel.md: New file.
---
website/posts/custom-kernel.md | 275 +
1 file changed, 275 insertions(+)
diff --git a/website/posts/custom-kernel.md b/website/posts/custom-kernel.md
new file mode 100644
index 000..b6b7d82
--- /dev/null
+++ b/website/posts/custom-kernel.md
@@ -0,0 +1,275 @@
+title: Creating and using a custom Linux kernel on Guix System
+date: 2019-05-20 00:00
+author: Efraim Flashner
+tags: kernel, customization
+---
+
+Guix is, at its core, a source based distribution with
+[substitutes](https://www.gnu.org/software/guix/manual/en/html_node/Substitutes.html),
+and as such building packages from their source code is an expected part
+of regular package installations and upgrades. Given this starting
+point, it makes sense that efforts are made to reduce the amount of time
+spent compiling packages, and recent changes and upgrades to the
+building and distribution of substitutes continues to be a topic of
+discussion within Guix.
+
+One of the packages which I prefer to not build myself is the
+Linux-Libre kernel. The kernel, while not requiring an overabundance of
+RAM to build, does take a very long time on my build machine (which my
+children argue is actually their Kodi computer), and I will often delay
+reconfiguring my laptop while I want for a substitute to be prepared by
+the official build farm. The official kernel configuration, as is the
+case with many GNU/Linux distributions, errs on the side of
+inclusiveness, and this is really what causes the build to take such a
+long time when I build the package for myself.
+
+The Linux kernel, however, can also just be described as a package
+installed on my machine, and as such can be customized just like any
+other package. The procedure is a little bit different, although this
+is primarily due to the nature of how the package definition is written.
+
+The
+[`linux-libre`](https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/linux.scm#n294)
+kernel package definition is actually a procedure
+which creates a package.
+
+```scheme
+(define* (make-linux-libre version hash supported-systems
+ #:key
+ ;; A function that takes an arch and a variant.
+ ;; See kernel-config for an example.
+ (extra-version #f)
+ (configuration-file #f)
+ (defconfig "defconfig")
+ (extra-options %default-extra-linux-options)
+ (patches (list %boot-logo-patch)))
+ ...)
+```
+
+The current `linux-libre` package is for the 5.1.x series, and is
+declared like this:
+
+```scheme
+(define-public linux-libre
+ (make-linux-libre %linux-libre-version
+%linux-libre-hash
+'("x86_64-linux" "i686-linux" "armhf-linux"
"aarch64-linux")
+#:patches %linux-libre-5.1-patches
+#:configuration-file kernel-config))
+```
+
+Any keys which are not assigned values inherit their default value from
+the make-linux-libre definition. When comparing the two snippets above,
+you may notice that the code comment in the first doesn't actually refer
+to the extra-version keyword; it is actually for configuration-file.
+Because of this, it is not actually easy to include a custom kernel
+configuration from the definition, but don't worry, there are other ways
+to work with what we do have.
+
+There are two ways to create a kernel with a custom kernel configuration.
+The first is to provide a standard `.config` file during the build
+process by including an actual `.config` file as a native-input to our
+custom kernel. The
+[following](https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/linux.scm#n379)
+is a snippet from the custom 'configure phase of the `make-linux-libre`
+package definition:
+
+```scheme
+(let ((build (assoc-ref %standard-phases 'build))
+ (config (assoc-ref (or native-inputs inputs) "kconfig")))
+
+ ;; Use a custom kernel configuration file or a default
+ ;; configuration file.
+ (if config
+ (begin
+(copy-file config ".config")
+(chmod ".config" #o666))
+ (invoke "make" ,defconfig))
+```
+
+Below is a sample kernel package for one of my computers. Linux-Libre
+is just like other regular packages and can be inherited and overridden
+like any other:
+
+```scheme
+(define-public linux-libre/E2140
+ (package
+(inherit linux-libre)
+(native-inputs
+ `(("kconfig" ,(local-file "E2140.config"))
+ ,@(alist-delete "kconfig&
branch master updated (b951df4 -> 46aa06e)
efraim pushed a change to branch master in repository guix-artwork. from b951df4 website: contact: Fix HTML validation error (DIVs inside P). new 46aa06e website: Add Guixdays ARM hacking post. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: website/posts/guixdays-arm-hacking.md | 310 ++ 1 file changed, 310 insertions(+) create mode 100644 website/posts/guixdays-arm-hacking.md
01/01: website: Add Guixdays ARM hacking post.
efraim pushed a commit to branch master
in repository guix-artwork.
commit 46aa06e444fef8944f523452e0cc88c51e231c93
Author: Efraim Flashner
Date: Wed Feb 6 19:43:06 2019 +0200
website: Add Guixdays ARM hacking post.
* website/posts/guixdays-arm-hacking.md: New file.
---
website/posts/guixdays-arm-hacking.md | 310 ++
1 file changed, 310 insertions(+)
diff --git a/website/posts/guixdays-arm-hacking.md
b/website/posts/guixdays-arm-hacking.md
new file mode 100644
index 000..5304482
--- /dev/null
+++ b/website/posts/guixdays-arm-hacking.md
@@ -0,0 +1,310 @@
+title: QA on non-Intel at Guix Days
+date: 2019-02-06 19:30
+author: Efraim Flashner
+tags: ARM, Guix Hackathon, FOSDEM
+---
+
+During the second day of Guix Days (a FOSDEM [fringe
+event](https://fosdem.org/2019/fringe)) we split up into smaller working groups
+based on our areas of interest. I led a group which aimed to address some of
+the package issues which exist on non-Intel architectures. Of course not
+everyone has access to an ARM board, but with the
+[`qemu-binfmt-service`](http://guix.info/manual/en/Virtualization-Services.html#Virtualization-Services)
+service it is possible to use QEMU and the `binfmt_misc` functionality of the
+Linux kernel to emulate these systems. Many have reported that this system
+emulation is comparable in speed to many of the available ARM boards on the
+market. Yet another possibility would be to do the hacking on an x86_64 system
+and, when we had a working prototype, to test it with QEMU or on actual ARM
+hardware.
+
+Our group decided to tackle Go, which was lacking support in Guix on armhf and
+aarch64. Upon checking the build logs from Cuirass and the source code for Go
we
+determined that Go did indeed require the `gold` linker from `binutils`. We
+didn't want to modify the copy of `binutils` in Guix since it is part of our
+bootstrap story, so we quickly put together a new package definition which
added
+the configure flag to enable `gold`.
+
+```scheme
+(define-public binutils-gold
+ (package
+(inherit binutils)
+(name "binutils-gold")
+(arguments
+ (substitute-keyword-arguments (package-arguments binutils)
+ ((#:configure-flags flags)
+`(cons "--enable-gold=default" ,flags))
+```
+
+This was an obvious first step, and one which we knew would fail. Had it been
+this easy `gold` would have been enabled back in 2012 when it was first added.
+Our error came in the form of one of the binaries not being able to link
against
+libstdc++.so, which is in the `gcc:lib` output. This was quickly added and we
+were off and building again.
+
+```scheme
+(define-public binutils-gold
+ (package
+(inherit binutils)
+(name "binutils-gold")
+(arguments
+ (substitute-keyword-arguments (package-arguments binutils)
+ ((#:configure-flags flags)
+`(cons "--enable-gold=default" ,flags
+(inputs
+ `(("gcc:lib" ,gcc "lib")
+```
+
+Once again this failed. What were we missing? The correct paths were included,
+the file was indeed in the `gcc:lib` output. We inspected the original
+`binutils` package again noticed that it was built against a static libgcc, so
+of course it wouldn't find the shared library. In order to work quickly we
+copied the configure flags rather than inheriting them from `binutils` and
+tried our build again.
+
+```scheme
+(define-public binutils-gold
+ (package
+(inherit binutils)
+(name "binutils-gold")
+(arguments
+ (substitute-keyword-arguments (package-arguments binutils)
+ ((#:configure-flags flags)
+`(cons* "--enable-gold=default"
+"--enable-new-dtags"
+"--with-lib-path=/no-ld-lib-path"
+"--enable-install-libbfd"
+"--enable-deterministic-archives"
+(inputs
+ `(("gcc:lib" ,gcc "lib")
+```
+
+This time we made it through the full build phase and we knew we were almost
+there. Our enthusiasm was quickly dampened when we got the error during the
+tests "unable to find the 'dc' program". What is this `dc` program? This isn't
+any package any of us had heard of before. It definitely wasn't packaged in
+Guix. A quick `apt-cache search dc` search in Ubuntu showed they didn't have
+package either. A second search of Ubuntu, `apt-file search dc | grep
'/bin/dc'`
+quickly showed us it was in the `bc` package, and soon we were building
+`binutils-gold` again.
+
+```scheme
+(define-public binutils-gold
+ (package
+(inherit binutils)
+(name "binutils-gold")
+(arguments
+ (substitute-keyword-arguments (package-arguments binutils)
+ ((#:configure-flags flags)
+`(cons* "--enable-gold=default"
+"--enable-new-dtags"
+"
branch master updated (edfdaf7 -> 5ac0c0c)
efraim pushed a change to branch master in repository maintenance. from edfdaf7 guix-europe: minutes: Add minutes of the Solidary Administrative Council. new 5ac0c0c hydra: Add efraim's key The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: hydra/keys/ssh/efraim.pub | 1 + 1 file changed, 1 insertion(+) create mode 100644 hydra/keys/ssh/efraim.pub
01/01: hydra: Add efraim's key
efraim pushed a commit to branch master in repository maintenance. commit 5ac0c0c20129c83c32a724cd228569eb589ed35c Author: Efraim Flashner Date: Fri Feb 1 13:53:30 2019 +0200 hydra: Add efraim's key --- hydra/keys/ssh/efraim.pub | 1 + 1 file changed, 1 insertion(+) diff --git a/hydra/keys/ssh/efraim.pub b/hydra/keys/ssh/efraim.pub new file mode 100644 index 000..739590e --- /dev/null +++ b/hydra/keys/ssh/efraim.pub @@ -0,0 +1 @@ +ssh-ed25519 C3NzaC1lZDI1NTE5IEbK0LZ74DUZm7+C4CtYDO1md8U1m4yK6cV2ZrL6cIiO efraim@macbook41
01/01: gnu: Add pinentry-efl.
efraim pushed a commit to branch master
in repository guix.
commit 5e369f8ab9e230193194b4d5846a5c78bbc89943
Author: Efraim Flashner
Date: Mon Nov 12 15:55:05 2018 +0200
gnu: Add pinentry-efl.
* gnu/packages/gnupg.scm (pinentry-efl): New variable.
* gnu/packages/patches/pinentry-efl.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
gnu/local.mk| 1 +
gnu/packages/gnupg.scm | 30 ++
gnu/packages/patches/pinentry-efl.patch | 798
3 files changed, 829 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index d2f085e..7fc8fb0 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1045,6 +1045,7 @@ dist_patch_DATA =
\
%D%/packages/patches/pinball-missing-separators.patch\
%D%/packages/patches/pinball-src-deps.patch \
%D%/packages/patches/pinball-system-ltdl.patch \
+ %D%/packages/patches/pinentry-efl.patch \
%D%/packages/patches/pingus-sdl-libs-config.patch\
%D%/packages/patches/pius.patch \
%D%/packages/patches/pixman-CVE-2016-5296.patch \
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index a9169b2..46ca812 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -40,6 +40,8 @@
#:use-module (gnu packages curl)
#:use-module (gnu packages crypto)
#:use-module (gnu packages emacs)
+ #:use-module (gnu packages enlightenment)
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages guile)
#:use-module (gnu packages openldap)
#:use-module (gnu packages perl)
@@ -863,6 +865,34 @@ software.")))
"Pinentry provides a console and a Qt GUI that allows users to enter a
passphrase when @code{gpg} is run and needs it.")))
+(define-public pinentry-efl
+ (package
+(inherit pinentry-tty)
+(name "pinentry-efl")
+(source
+ (origin
+(inherit (package-source pinentry-tty))
+(patches (search-patches "pinentry-efl.patch"
+(arguments
+ '(#:configure-flags '("--enable-pinentry-efl")
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'bootstrap
+ (lambda _
+ (invoke "sh" "autogen.sh"))
+(native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("gettext" ,gettext-minimal)
+ ,@(package-native-inputs pinentry-tty)))
+(inputs
+ `(("efl" ,efl)
+ ,@(package-inputs pinentry-tty)))
+(description
+ "Pinentry provides a console and a graphical interface for the
+@dfn{Enlightenment Foundation Libraries} (EFL) that allows users to enter a
+passphrase when @code{gpg} is run and needs it.")))
+
(define-public pinentry
(package (inherit pinentry-gtk2)
(name "pinentry")))
diff --git a/gnu/packages/patches/pinentry-efl.patch
b/gnu/packages/patches/pinentry-efl.patch
new file mode 100644
index 000..5ba79e2
--- /dev/null
+++ b/gnu/packages/patches/pinentry-efl.patch
@@ -0,0 +1,798 @@
+https://git.gnupg.org/cgi-bin/gitweb.cgi?p=pinentry.git;a=commit;h=948105b7a34ec9a9e5479d376b7c86bafee50a01
+This patch can be removed with the next release of pinentry.
+
+From 948105b7a34ec9a9e5479d376b7c86bafee50a01 Mon Sep 17 00:00:00 2001
+From: "William L. Thomson Jr"
+Date: Tue, 29 May 2018 22:50:47 +0100
+Subject: [PATCH] efl: Add an EFL-based pinentry.
+
+* NEWS: Update.
+* Makefile.am: Add new efl subdirectory.
+* configure.ac: Add --enable-pinentry-efl option.
+* efl/Makefile.am: New file.
+* efl/pinentry-efl.c: New file.
+
+Signed-off-by: Damien Goutte-Gattat
+---
+ Makefile.am| 8 +-
+ configure.ac | 44 +++-
+ efl/Makefile.am| 38
+ efl/pinentry-efl.c | 623 +
+ 6 files changed, 716 insertions(+), 2 deletions(-)
+ create mode 100644 efl/Makefile.am
+ create mode 100644 efl/pinentry-efl.c
+
+diff --git a/Makefile.am b/Makefile.am
+index 8c8b8e5..b8fd0e1 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -82,10 +82,16 @@ else
+ pinentry_fltk =
+ endif
+
++if BUILD_PINENTRY_EFL
++pinentry_efl = efl
++else
++pinentry_efl =
++endif
++
+ SUBDIRS = m4 secmem pinentry ${pinentry_curses} ${pinentry_tty} \
+ ${pinentry_emacs} ${pinentry_gtk_2} ${pinentry_gnome_3} \
+ ${pinentry_qt} ${pinentry_tqt} ${pinentry_w32} \
+- ${pinentry_fltk} doc
++ ${pinentry_fltk} ${pinentry_efl} doc
+
+
+ install-exec-local:
+diff --git a/configure.ac b/configure.ac
+index ff6c2e0..e305e44 100644
+--- a/configure.ac
b/configure.ac
+@@ -419,6 +419,42 @@ fi
+
+
+ dnl
++dnl Check for EFL pinentry programs.
++dnl
++AC_ARG_ENABLE(pinentry-efl,
++AC_HELP_STRING([--enable-pinentry-efl], [build EFL pinentry]),
++
branch master updated (975b796 -> 5e369f8)
efraim pushed a change to branch master in repository guix. from 975b796 .gitignore: Re-add 'authenticate' script. new 5e369f8 gnu: Add pinentry-efl. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/local.mk| 1 + gnu/packages/gnupg.scm | 30 ++ gnu/packages/patches/pinentry-efl.patch | 798 3 files changed, 829 insertions(+) create mode 100644 gnu/packages/patches/pinentry-efl.patch
01/01: gnu: linkchecker: Use 'git-file-name' for the source.
efraim pushed a commit to branch core-updates in repository guix. commit 774f8bbeb1f3515c3af08e67f24e508e7c4cc067 Author: Efraim Flashner Date: Sun Nov 18 11:54:53 2018 +0200 gnu: linkchecker: Use 'git-file-name' for the source. * gnu/packages/web.scm (linkchecker)[source]: Add missing 'file-name' field. --- gnu/packages/web.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d56b82c..db1654a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5771,6 +5771,7 @@ Instagram and YouTube.") (uri (git-reference (url "https://github.com/linkchecker/linkchecker;) (commit (string-append "v" version + (file-name (git-file-name name version)) (sha256 (base32 "03ihjmc4bqxxqv71bb43r2f23sx0xnbq1k2fsg9fw05qa5s9x187"
branch core-updates updated (74854d1 -> 774f8bb)
efraim pushed a change to branch core-updates in repository guix. from 74854d1 gnu: python-pytest-localserver: Update to 0.5.0. new 774f8bb gnu: linkchecker: Use 'git-file-name' for the source. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/web.scm | 1 + 1 file changed, 1 insertion(+)
branch core-updates updated (e005ddc -> 74854d1)
efraim pushed a change to branch core-updates in repository guix. from e005ddc gnu: libgtextutils: Re-instate custom bootstrap phase. new 45a2346 gnu: python-pytest-localserver: Fix test suite. new 74854d1 gnu: python-pytest-localserver: Update to 0.5.0. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/check.scm | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-)
01/02: gnu: python-pytest-localserver: Fix test suite.
efraim pushed a commit to branch core-updates
in repository guix.
commit 45a2346f329935bd6837e5fa3eca6232ef694242
Author: Efraim Flashner
Date: Sun Nov 18 11:39:09 2018 +0200
gnu: python-pytest-localserver: Fix test suite.
* gnu/packages/check.scm (python-pytest-localserver): Replace custom
'check phase.
---
gnu/packages/check.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 24a9902..d852952 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1351,11 +1351,11 @@ the last py.test invocation.")
"08f06rvj31wqf0vgmd1waya87r7vy6x8ck48lxl3dxy83q5gcam7"
(build-system python-build-system)
(arguments
- `(#:phases (modify-phases %standard-phases
+ '(#:phases
+ (modify-phases %standard-phases
(replace 'check
(lambda _
- (invoke "py.test" "--genscript=runtests.py")
- (invoke "py.test"))
+ (invoke "py.test" "-v"))
(native-inputs
`(("python-pytest" ,python-pytest)
("python-requests" ,python-requests)
02/02: gnu: python-pytest-localserver: Update to 0.5.0.
efraim pushed a commit to branch core-updates in repository guix. commit 74854d11ceb6d54c5ba27a7554a69577ddc983fa Author: Efraim Flashner Date: Sun Nov 18 11:40:29 2018 +0200 gnu: python-pytest-localserver: Update to 0.5.0. * gnu/packages/check.scm (python-pytest-localserver): Update to 0.5.0. --- gnu/packages/check.scm | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index d852952..937e4e0 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1342,13 +1342,13 @@ the last py.test invocation.") (define-public python-pytest-localserver (package (name "python-pytest-localserver") -(version "0.4.1") +(version "0.5.0") (source (origin - (method url-fetch) - (uri (pypi-uri "pytest-localserver" version)) - (sha256 - (base32 - "08f06rvj31wqf0vgmd1waya87r7vy6x8ck48lxl3dxy83q5gcam7" + (method url-fetch) + (uri (pypi-uri "pytest-localserver" version)) + (sha256 + (base32 +"1hpgpxrpfq5c731ndnsay2lc0y9nh2wy9fn1f83s3z8xkn82fm1s" (build-system python-build-system) (arguments '(#:phases
01/01: gnu: libgtextutils: Re-instate custom bootstrap phase.
efraim pushed a commit to branch core-updates
in repository guix.
commit e005ddc223683f030d4dc64588968e474328eb65
Author: Efraim Flashner
Date: Sun Nov 18 10:14:57 2018 +0200
gnu: libgtextutils: Re-instate custom bootstrap phase.
The source lacks a standard bootstrap script so the bootstrap phase is
skipped otherwise.
* gnu/packages/textutils.smc (libgtextutils)[arguments]: Replace
'bootstrap phase with upstream's bootstrap phase.
---
gnu/packages/textutils.scm | 5 +
1 file changed, 5 insertions(+)
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index e9a4ab3..cda7923 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -198,6 +198,11 @@ encoding, supporting Unicode version 9.0.0.")
(sha256
(base32 "0jiybkb2z58wa2msvllnphr4js2hvjvh988pavb3mzkgr6ihwbkr"
(build-system gnu-build-system)
+(arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (replace 'bootstrap
+ (lambda _ (invoke "sh" "reconf"))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
branch core-updates updated (bc9aa60 -> e005ddc)
efraim pushed a change to branch core-updates in repository guix. from bc9aa60 gnu: nss: Make tests deterministic. new e005ddc gnu: libgtextutils: Re-instate custom bootstrap phase. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/textutils.scm | 5 + 1 file changed, 5 insertions(+)
branch master updated (2d86eaf -> c61f36f)
efraim pushed a change to branch master in repository guix. from 2d86eaf gnu: sambamba: Update to 0.6.8. new c61f36f doc: Fix typo in connman config. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
01/01: doc: Fix typo in connman config.
efraim pushed a commit to branch master
in repository guix.
commit c61f36f368c563c48815de0abe625383909b0a8d
Author: Giovanni Biscuolo
Date: Wed Nov 14 21:44:13 2018 +0100
doc: Fix typo in connman config.
* doc/guix.texi (Networking Services): Fix typo in connman config
"disable-vpn?" parameter documentation, semantic is inverted.
Signed-off-by: Efraim Flashner
---
doc/guix.texi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 0ba034e..765261f 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -11832,7 +11832,7 @@ Data Type representing the configuration of connman.
The connman package to use.
@item @code{disable-vpn?} (default: @code{#f})
-When true, enable connman's vpn plugin.
+When true, disable connman's vpn plugin.
@end table
@end deftp
01/01: gnu: vifm: Update to 0.10.
efraim pushed a commit to branch master
in repository guix.
commit 53bcee9ea7e885e756ad4689381aa2bdfbac97ef
Author: Efraim Flashner
Date: Mon Nov 12 12:36:15 2018 +0200
gnu: vifm: Update to 0.10.
* gnu/packages/vim.scm (vifm): Update to 0.10.
---
gnu/packages/vim.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index c6906b1..c974ebc 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -718,7 +718,7 @@ refactor Vim in order to:
(define-public vifm
(package
(name "vifm")
-(version "0.9.1")
+(version "0.10")
(source
(origin
(method url-fetch)
@@ -729,7 +729,7 @@ refactor Vim in order to:
"vifm-" version ".tar.bz2")))
(sha256
(base32
- "1cz7vjjmghgdxd1lvsdwv85gvx4kz8idq14qijpwkpfrf2va9f98"
+ "1f380xcyjnm4xmcdazs6dj064bwddhywvn3mgm36k7r7b2gnjnp0"
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--disable-build-timestamp")
branch master updated (5c47584 -> 53bcee9)
efraim pushed a change to branch master in repository guix. from 5c47584 gnu: go-github-com-aarzilli-golua: Fix for go-1.11. new 53bcee9 gnu: vifm: Update to 0.10. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/vim.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
branch core-updates updated (261e421 -> 2bdca67)
efraim pushed a change to branch core-updates in repository guix. from 261e421 gnu: python-pyclipper: Enable tests. new 22d04ce gnu: python-rq: Update to 0.12.0. new 2bdca67 gnu: python-yapf: Update to 0.24.0. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/databases.scm | 4 ++-- gnu/packages/python.scm| 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
01/02: gnu: python-rq: Update to 0.12.0.
efraim pushed a commit to branch core-updates
in repository guix.
commit 22d04ceda000b16881071094e4a1c8cddbe09dfb
Author: Efraim Flashner
Date: Sun Nov 11 11:47:57 2018 +0200
gnu: python-rq: Update to 0.12.0.
* gnu/packages/databases.scm (python-rq): Update to 0.12.0.
---
gnu/packages/databases.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 9e75245..1617c28 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -2749,13 +2749,13 @@ reasonable substitute.")
(define-public python-rq
(package
(name "python-rq")
-(version "0.7.1")
+(version "0.12.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "rq" version))
(sha256
-(base32 "0gaq5pnh0zy46r8jvygi0ifbvz3pq6i7xla78ijcgjw0x77qzsdh"
+(base32 "16d8kni57xlnah2hawy4xgw21xrv3f64j5q5shyp3zxx4yd9iibs"
(build-system python-build-system)
(propagated-inputs
`(("python-click" ,python-click)
02/02: gnu: python-yapf: Update to 0.24.0.
efraim pushed a commit to branch core-updates
in repository guix.
commit 2bdca673517c566d55f5f3a540160b22fc51039e
Author: Efraim Flashner
Date: Sun Nov 11 11:53:15 2018 +0200
gnu: python-yapf: Update to 0.24.0.
* gnu/packages/python.scm (python-yapf): Update to 0.24.0.
---
gnu/packages/python.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index cce9955..41c2a1f 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -13272,14 +13272,14 @@ user's @file{~/Trash} directory.")
(define-public python-yapf
(package
(name "python-yapf")
-(version "0.21.0")
+(version "0.24.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "yapf" version))
(sha256
(base32
- "144gc7d6b1415vh02409rnb8qd5kxi6mxlr7y64d5cizgxbf72kx"
+ "0anwby0ydmyzcsgjc5dn1ryddwvii4dq61vck447q0n96npnzfyf"
(build-system python-build-system)
(home-page "https://github.com/google/yapf;)
(synopsis "Formatter for Python code")
03/05: gnu: python-paste: Update to 3.0.4.
efraim pushed a commit to branch core-updates
in repository guix.
commit 95176544d54cbc8c7c2bacd96e19b4a1411afbff
Author: Efraim Flashner
Date: Sun Nov 11 10:41:32 2018 +0200
gnu: python-paste: Update to 3.0.4.
* gnu/packages/python-web.scm (python-paste): Update to 3.0.4.
[source]: Remove patch, add snippet to remove one test.
[native-inputs]: Add python-pytest, python-pytest-runner.
* gnu/packages/patches/python-paste-remove-website-test.patch: Remove
file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
gnu/local.mk| 1 -
.../patches/python-paste-remove-website-test.patch | 21 -
gnu/packages/python-web.scm | 18 --
3 files changed, 12 insertions(+), 28 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 15088a5..31dafdd 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1086,7 +1086,6 @@ dist_patch_DATA =
\
%D%/packages/patches/python-faker-fix-build-32bit.patch \
%D%/packages/patches/python-mox3-python3.6-compat.patch \
%D%/packages/patches/python-testtools.patch \
- %D%/packages/patches/python-paste-remove-website-test.patch \
%D%/packages/patches/python-paste-remove-timing-test.patch \
%D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \
%D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
diff --git a/gnu/packages/patches/python-paste-remove-website-test.patch
b/gnu/packages/patches/python-paste-remove-website-test.patch
deleted file mode 100644
index 93417fb..000
--- a/gnu/packages/patches/python-paste-remove-website-test.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Remove the test to see if the Python Paste website is up.
-
-Obviously without network access there is no way for us to check this, and
-it's pretty strange to test a project's website when you really mean to test
-the project anyhow...
-
a/tests/test_proxy.py 2016-02-22 19:13:04.040117767 -0800
-+++ b/tests/test_proxy.py 2016-02-22 19:13:04.040117767 -0800
-@@ -1,12 +1,3 @@
- from paste import proxy
- from paste.fixture import TestApp
-
--def test_paste_website():
--# Not the most robust test...
--# need to test things like POSTing to pages, and getting from pages
--# that don't set content-length.
--app = proxy.Proxy('http://pythonpaste.org')
--app = TestApp(app)
--res = app.get('/')
--assert 'documentation' in res
--
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 6a8b1f2..e158df2 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Eric Dvorsak
-;;; Copyright © 2015, 2016, 2017 Efraim Flashner
+;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner
;;; Copyright © 2017 Christopher Baines
;;; Copyright © 2016, 2017 Danny Milosavljevic
;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge
@@ -2628,19 +2628,25 @@ available in Django, but is a standalone package.")
(define-public python-paste
(package
(name "python-paste")
-(version "2.0.3")
+(version "3.0.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "Paste" version))
(sha256
(base32
- "062jk0nlxf6lb2wwj6zc20rlvrwsnikpkh90y0dn8cjch93s6ii3"))
- (patches (search-patches "python-paste-remove-website-test.patch"
-"python-paste-remove-timing-test.patch"
+ "01w26w9jyfkh0mfydhfz3dwy3pj3fw7mzvj0lna3vs8hyx1hwl0n"))
+ (patches (search-patches "python-paste-remove-timing-test.patch"))
+ (modules '((guix build utils)))
+ (snippet
+'(begin
+ ;; This test calls out to the internet.
+ (delete-file "tests/test_proxy.py") #t
(build-system python-build-system)
(native-inputs
- `(("python-nose" ,python-nose)))
+ `(("python-pytest" ,python-pytest)
+ ("python-pytest-runner" ,python-pytest-runner)
+ ("python-nose" ,python-nose)))
(propagated-inputs
`(("python-six" ,python-six)))
(home-page "http://pythonpaste.org;)
01/05: gnu: python-alembic: Update to 1.0.2.
efraim pushed a commit to branch core-updates
in repository guix.
commit c92d056a8b83aa51c2223cc3d840e3d9775e64b7
Author: Efraim Flashner
Date: Sun Nov 11 09:36:17 2018 +0200
gnu: python-alembic: Update to 1.0.2.
* gnu/packages/databases.scm (python-alembic, python2-alembic): Update
to 1.0.2.
---
gnu/packages/databases.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index d4a1d35..9e75245 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -2424,14 +2424,14 @@ You might also want to install the following optional
dependencies:
(define-public python-alembic
(package
(name "python-alembic")
-(version "0.9.6")
+(version "1.0.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "alembic" version))
(sha256
(base32
- "0cm73vabrqj92v7a0wwvldj8j7bc7dwv358kvkk7p87gx7mm2a04"
+ "0asqz9mwc4w8bsar1icv3ik9jslxrj3gv3yxgmhc6nc6r9qbkg04"
(build-system python-build-system)
(native-inputs
`(("python-mock" ,python-mock)
02/05: gnu: python-networkx2: Remove variable.
efraim pushed a commit to branch core-updates
in repository guix.
commit 5ac2b2717f8d4b05c39c5717843d40bb1a493364
Author: Efraim Flashner
Date: Sun Nov 11 10:29:56 2018 +0200
gnu: python-networkx2: Remove variable.
* gnu/packages/python.scm (python-networkx2): Remove variable.
* gnu/packages/patches/python-networkx2-reproducible-build.patch: Remove
file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
gnu/local.mk | 1 -
.../python-networkx2-reproducible-build.patch | 29 --
gnu/packages/python.scm| 19 --
3 files changed, 49 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 545a7d1..15088a5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1080,7 +1080,6 @@ dist_patch_DATA =
\
%D%/packages/patches/python-cairocffi-dlopen-path.patch \
%D%/packages/patches/python-fix-tests.patch \
%D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \
- %D%/packages/patches/python-networkx2-reproducible-build.patch \
%D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \
%D%/packages/patches/python-scikit-learn-fix-test-non-determinism.patch
\
%D%/packages/patches/python-configobj-setuptools.patch \
diff --git a/gnu/packages/patches/python-networkx2-reproducible-build.patch
b/gnu/packages/patches/python-networkx2-reproducible-build.patch
deleted file mode 100644
index 8274767..000
--- a/gnu/packages/patches/python-networkx2-reproducible-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c065b972ed294769a41936d6b9feb336473af5d1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?G=C3=A1bor=20Boskovits?=
-Date: Sat, 4 Nov 2017 15:28:47 +0100
-Subject: Fix SOURCE_DATE_EPOCH ignored bug (#2735)
-
-* Fix SOURCE_DATE_EPOCH ignored bug
-
-Fix a bug in networkx/release.py that makes build
-non-reproducible.
- networkx/release.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/networkx/release.py b/networkx/release.py
-index e81fc0c0..6322cf0d 100644
a/networkx/release.py
-+++ b/networkx/release.py
-@@ -135,7 +135,7 @@ def get_revision():
-
- def get_info(dynamic=True):
- # Date information
--date_info = datetime.datetime.now()
-+date_info =
datetime.datetime.utcfromtimestamp(int(os.environ.get('SOURCE_DATE_EPOCH',
time.time(
- date = time.asctime(date_info.timetuple())
-
- revision, version, version_info, vcs_info = None, None, None, None
---
-2.14.2
-
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index d908050..f459282 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -5208,25 +5208,6 @@ of the structure, dynamics, and functions of complex
networks.")
(define-public python2-networkx
(package-with-python2 python-networkx))
-;; Define new package, because the current version of python-colormath does
-;; not build against 2.0.
-(define-public python-networkx2
- (package (inherit python-networkx)
-(name "python-networkx2")
-(version "2.0")
-(source
- (origin
- (method url-fetch)
- (uri (pypi-uri "networkx" version ".zip"))
- (sha256
-(base32
- "1ajl2jp8qry9nyjzzkqpy0vmsr14d23z1qk7y0vr5iwjbpvzhpyd"))
- (patches
-(search-patches "python-networkx2-reproducible-build.patch"))
-
-(define-public python2-networkx2
- (package-with-python2 python-networkx2))
-
(define-public python-datrie
(package
(name "python-datrie")
04/05: gnu: python-pyclipper: Update to 1.1.0post1.
efraim pushed a commit to branch core-updates
in repository guix.
commit 8189ce6f05ebc49fc85934bdd1c81f8d43496a93
Author: Efraim Flashner
Date: Sun Nov 11 11:07:21 2018 +0200
gnu: python-pyclipper: Update to 1.1.0post1.
* gnu/packages/python.scm (python-pyclipper): Update to 1.1.0post1.
[source]: Add snippet to remove cythonized source files.
[arguments]: Add custom phase to generate cythonized files.
[native-inputs]: Add python-cython.
[description]: Update clipper library version.
---
gnu/packages/python.scm | 22 +-
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index f459282..e8d8daa 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -12896,26 +12896,38 @@ belong to tagged versions.")
(define-public python-pyclipper
(package
(name "python-pyclipper")
-(version "1.0.6")
+(version "1.1.0.post1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pyclipper" version ".zip"))
(sha256
(base32
- "1zpmwv3bya3j984y5cf9x9d5108kf6mxldcba68wiq0frv5qrssw"
+ "0ldbkbnx94an4zzrwb1sxmg6k0jgk4cwmvcdyy8y5k1zslc612wa"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; This file is generated by Cython.
+ (delete-file "pyclipper/pyclipper.cpp") #t
(build-system python-build-system)
(arguments
- `(#:tests? #f)); 8 Tests fail, 37 succeed
+ `(#:tests? #f ; 8 Tests fail, 37 succeed
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'cythonize-sources
+ (lambda _
+ (with-directory-excursion "pyclipper"
+ (invoke "cython" "--cplus" "pyclipper.pyx")))
(propagated-inputs
`(("python-setuptools-scm-git-archive"
,python-setuptools-scm-git-archive)))
(native-inputs
- `(("unzip" ,unzip)))
+ `(("python-cython" ,python-cython)
+ ("unzip" ,unzip)))
(home-page "https://github.com/greginvm/pyclipper;)
(synopsis "Wrapper for Angus Johnson's Clipper library")
(description
"Pyclipper is a Cython wrapper for the C++ translation of the
- Angus Johnson's polygon clipping Clipper library (ver. 6.2.1).")
+Angus Johnson's polygon clipping Clipper library (ver. 6.4.2).")
(license license:expat)))
(define-public python2-pyclipper
branch core-updates updated (28b24e9 -> 261e421)
efraim pushed a change to branch core-updates in repository guix. from 28b24e9 gnu: bitshuffle: Don't use '-march=native'. new c92d056 gnu: python-alembic: Update to 1.0.2. new 5ac2b27 gnu: python-networkx2: Remove variable. new 9517654 gnu: python-paste: Update to 3.0.4. new 8189ce6 gnu: python-pyclipper: Update to 1.1.0post1. new 261e421 gnu: python-pyclipper: Enable tests. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/local.mk | 2 - gnu/packages/databases.scm | 4 +- .../python-networkx2-reproducible-build.patch | 29 --- .../patches/python-paste-remove-website-test.patch | 21 --- gnu/packages/python-web.scm| 18 ++--- gnu/packages/python.scm| 43 ++ 6 files changed, 33 insertions(+), 84 deletions(-) delete mode 100644 gnu/packages/patches/python-networkx2-reproducible-build.patch delete mode 100644 gnu/packages/patches/python-paste-remove-website-test.patch
branch core-updates updated (1a392ee -> 28b24e9)
efraim pushed a change to branch core-updates in repository guix. from 1a392ee gnu: nfs-utils: Fix building with glibc@2.28. new 5528b8e gnu: tvtime: Fix building with glibc@2.28. new 01029e2 gnu: bitshuffle: Update to 0.3.5. new 28b24e9 gnu: bitshuffle: Don't use '-march=native'. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/compression.scm | 20 +--- gnu/packages/tv.scm | 10 ++ 2 files changed, 27 insertions(+), 3 deletions(-)
01/03: gnu: tvtime: Fix building with glibc@2.28.
efraim pushed a commit to branch core-updates
in repository guix.
commit 5528b8e7885834e80e41fe876b9c501c7d95bc6a
Author: Efraim Flashner
Date: Sun Nov 11 08:48:18 2018 +0200
gnu: tvtime: Fix building with glibc@2.28.
* gnu/packages/tvtime.scm (tvtime)[arguments]: Add custom phase to add
missing import.
---
gnu/packages/tv.scm | 10 ++
1 file changed, 10 insertions(+)
diff --git a/gnu/packages/tv.scm b/gnu/packages/tv.scm
index ef67ad3..2196162 100644
--- a/gnu/packages/tv.scm
+++ b/gnu/packages/tv.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017, 2018 Alex Kost
+;;; Copyright © 208 Efraim Flashner
;;;
;;; This file is part of GNU Guix.
;;;
@@ -43,6 +44,15 @@
(base32
"1367rl3n6qxwf30lqyz234zpb43s9xjhig3hrvbg7cbqcl8g4fs0"
(build-system gnu-build-system)
+(arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-glibc-compatability
+ (lambda _
+ (substitute* "src/get_media_devices.c"
+ (("")
+"\n#include "))
+ #t)
(inputs
`(("alsa-lib" ,alsa-lib)
("libx11" ,libx11)
03/03: gnu: bitshuffle: Don't use '-march=native'.
efraim pushed a commit to branch core-updates
in repository guix.
commit 28b24e9975967119620e272662b8ffc4a3f783aa
Author: Efraim Flashner
Date: Sun Nov 11 08:56:49 2018 +0200
gnu: bitshuffle: Don't use '-march=native'.
* gnu/packages/compression.scm (bitshuffle)[arguments]: Add custom phase
to substitute out the '-march=native' compilation flag.
---
gnu/packages/compression.scm | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index d24f48c..7f6857d 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1210,7 +1210,14 @@ well as bzip2.")
#t
(build-system python-build-system)
(arguments
- `(#:tests? #f)) ; fail: https://github.com/h5py/h5py/issues/769
+ `(#:tests? #f ; fail: https://github.com/h5py/h5py/issues/769
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'dont-build-native
+ (lambda _
+ (substitute* "setup.py"
+ (("'-march=native', ") ""))
+ #t)
(inputs
`(("numpy" ,python-numpy)
("h5py" ,python-h5py)
02/03: gnu: bitshuffle: Update to 0.3.5.
efraim pushed a commit to branch core-updates in repository guix. commit 01029e20430c54333bdc50d2b6db8fa5f389f331 Author: Efraim Flashner Date: Sun Nov 11 08:55:28 2018 +0200 gnu: bitshuffle: Update to 0.3.5. * gnu/packages/compression.scm (bitshuffle): Update to 0.3.5. [source]: Add snippet to remove cythonized source files. --- gnu/packages/compression.scm | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 5b09cb5..d24f48c 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1194,13 +1194,20 @@ well as bzip2.") (define-public bitshuffle (package (name "bitshuffle") -(version "0.3.4") +(version "0.3.5") (source (origin (method url-fetch) (uri (pypi-uri "bitshuffle" version)) (sha256 (base32 -"0ydawb01ghsvmw0lraczhrgvkjj97bpg98f1qqs1cnfp953mdd5v" +"1823x61kyax4dc2hjmc1xraskxi1193y8lvxd03vqv029jrj8cjy")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove generated Cython files. + (delete-file "bitshuffle/h5.c") + (delete-file "bitshuffle/ext.c") + #t (build-system python-build-system) (arguments `(#:tests? #f)) ; fail: https://github.com/h5py/h5py/issues/769
01/01: gnu: perl-autovivification: Update to 0.18.
efraim pushed a commit to branch master in repository guix. commit cab70d4c2ae8c92337501b19dd938792447ad5b8 Author: Efraim Flashner Date: Sat Nov 10 21:48:26 2018 +0200 gnu: perl-autovivification: Update to 0.18. * gnu/packages/perl.scm (perl-autovivification): Update to 0.18. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index f556d19..cbdf070 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -364,7 +364,7 @@ sometimes even without using a single syscall.") (define-public perl-autovivification (package (name "perl-autovivification") -(version "0.16") +(version "0.18") (source (origin (method url-fetch) @@ -372,7 +372,7 @@ sometimes even without using a single syscall.") "autovivification-" version ".tar.gz")) (sha256 (base32 - "1422kw9fknv7rbjkgdfflg1q3mb69d3yryszp38dn0bgzkqhwkc1" + "01giacr2sx6b9bgfz6aqw7ndcnf08j8n6kwhm7880a94hmb9g69d" (build-system perl-build-system) (home-page "https://metacpan.org/release/autovivification;) (synopsis "Lexically disable autovivification")
branch master updated (717d29e -> cab70d4)
efraim pushed a change to branch master in repository guix. from 717d29e gnu: icecat: Add more fixes from mozilla-esr60. new cab70d4 gnu: perl-autovivification: Update to 0.18. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
01/02: gnu: perl-autovivification: Update to 0.18.
efraim pushed a commit to branch core-updates in repository guix. commit c1ab1590854e4a1af2436c0c60b8dd570b219598 Author: Efraim Flashner Date: Sat Nov 10 21:48:26 2018 +0200 gnu: perl-autovivification: Update to 0.18. * gnu/packages/perl.scm (perl-autovivification): Update to 0.18. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index cadef60..d6ea360 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -327,7 +327,7 @@ sometimes even without using a single syscall.") (define-public perl-autovivification (package (name "perl-autovivification") -(version "0.16") +(version "0.18") (source (origin (method url-fetch) @@ -335,7 +335,7 @@ sometimes even without using a single syscall.") "autovivification-" version ".tar.gz")) (sha256 (base32 - "1422kw9fknv7rbjkgdfflg1q3mb69d3yryszp38dn0bgzkqhwkc1" + "01giacr2sx6b9bgfz6aqw7ndcnf08j8n6kwhm7880a94hmb9g69d" (build-system perl-build-system) (home-page "https://metacpan.org/release/autovivification;) (synopsis "Lexically disable autovivification")
02/02: gnu: nfs-utils: Fix building with glibc@2.28.
efraim pushed a commit to branch core-updates
in repository guix.
commit 1a392ee7aed74e345f5263063fdde9a739082af4
Author: Efraim Flashner
Date: Sat Nov 10 22:34:56 2018 +0200
gnu: nfs-utils: Fix building with glibc@2.28.
* gnu/packages/nfs.scm (nfs-utils)[arguments]: Add custom phase to fix
building with glibc@2.28.
---
gnu/packages/nfs.scm | 8
1 file changed, 8 insertions(+)
diff --git a/gnu/packages/nfs.scm b/gnu/packages/nfs.scm
index f6bb5b3..bdb36d2 100644
--- a/gnu/packages/nfs.scm
+++ b/gnu/packages/nfs.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 John Darrington
;;; Copyright © 2017, 2018 Leo Famulari
+;;; Copyright © 2018 Efraim Flashner
;;;
;;; This file is part of GNU Guix.
;;;
@@ -60,6 +61,13 @@
,(string-append "--with-krb5=" (assoc-ref %build-inputs "mit-krb5")))
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'fix-glibc-compatability
+ (lambda _
+ (substitute* '("utils/blkmapd/device-discovery.c"
+"utils/blkmapd/dm-device.c")
+ (("")
+"\n#include "))
+ #t))
(add-before 'configure 'adjust-command-file-names
(lambda _
;; Remove assumptions of FHS from start-statd script
branch core-updates updated (1de2937 -> 1a392ee)
efraim pushed a change to branch core-updates in repository guix. from 1de2937 gnu: idutils: Fix building with glibc@2.28. new c1ab159 gnu: perl-autovivification: Update to 0.18. new 1a392ee gnu: nfs-utils: Fix building with glibc@2.28. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/nfs.scm | 8 gnu/packages/perl.scm | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-)
branch master updated (a7553a7 -> e8b9aaf)
efraim pushed a change to branch master in repository guix. from a7553a7 services: dovecot: Set correct default value for the "auth" service. new e8b9aaf mtd-utils: Update to 2.0.2. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/linux.scm | 16 1 file changed, 8 insertions(+), 8 deletions(-)
01/01: mtd-utils: Update to 2.0.2.
efraim pushed a commit to branch master
in repository guix.
commit e8b9aaf0b167812dee6be26772837ef2a271a843
Author: Efraim Flashner
Date: Sat Nov 10 20:54:00 2018 +0200
mtd-utils: Update to 2.0.2.
* gnu/packages/linux.scm (mtd-utils): Update to 2.0.2.
[arguments]: Remove 'test-target, 'make-flags. Re-enable 'configure
phase. Add 'configure-flag for the unit-tests.
[native-inputs]: Add cmocka, pkg-config.
---
gnu/packages/linux.scm | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 9bf995b..7d1987b 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3949,7 +3949,7 @@ are exceeded.")
(define-public mtd-utils
(package
(name "mtd-utils")
-(version "1.5.2")
+(version "2.0.2")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3957,18 +3957,18 @@ are exceeded.")
"mtd-utils-" version ".tar.bz2"))
(sha256
(base32
-"007lhsd8yb34l899r4m37whhzdw815cz4fnjbpnblfha524p7dax"
+"1f30jszknc5v6ykmil8ajxgksmcg54q3rsp84jsancp9x0dycggv"
+(arguments
+ '(#:configure-flags '("--enable-unit-tests")))
+(native-inputs
+ `(("cmocka" ,cmocka)
+ ("pkg-config" ,pkg-config)))
(inputs
- `(("acl" ,acl)
+ `(("acl" ,acl) ; for XATTR
("libuuid" ,util-linux)
("lzo" ,lzo)
("zlib" ,zlib)))
(build-system gnu-build-system)
-(arguments
- `(#:test-target "tests"
- #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
- #:phases (modify-phases %standard-phases
- (delete 'configure
(synopsis "MTD Flash Storage Utilities")
(description "This package provides utilities for testing, partitioning,
etc
of flash storage.")
01/01: gnu: lbzip2: Fix building with glibc@2.28.
efraim pushed a commit to branch core-updates
in repository guix.
commit f268b744b84734b374a15feae1f02b9f2c4085c7
Author: Efraim Flashner
Date: Sat Nov 10 20:07:48 2018 +0200
gnu: lbzip2: Fix building with glibc@2.28.
* gnu/packages/compression.scm (lbzip2)[source]: Add snippet to patch
bundled gnulib for glibc@2.28.
---
gnu/packages/compression.scm | 18 +-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 7249cf7..41289ad 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -363,7 +363,23 @@ decompression.")
version ".tar.gz"))
(sha256
(base32
-"1sahaqc5bw4i0iyri05syfza4ncf5cml89an033fspn97klmxis6"
+"1sahaqc5bw4i0iyri05syfza4ncf5cml89an033fspn97klmxis6"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Adjust the bundled gnulib to work with glibc 2.28. See
e.g.
+ ;; "m4-gnulib-libio.patch". This is a phase rather than patch
+ ;; or snippet to work around <https://bugs.gnu.org/32347>.
+ (substitute* (find-files "lib" "\\.c$")
+ (("#if defined _IO_ftrylockfile")
+"#if defined _IO_EOF_SEEN"))
+ (substitute* "lib/stdio-impl.h"
+ (("^/\\* BSD stdio derived implementations")
+(string-append "#if !defined _IO_IN_BACKUP && defined
_IO_EOF_SEEN\n"
+ "# define _IO_IN_BACKUP 0x100\n"
+ "#endif\n\n"
+ "/* BSD stdio derived implementations")))
+ #t
(build-system gnu-build-system)
(synopsis "Parallel bzip2 compression utility")
(description
02/02: gnu: dvd+rw-tools: Use invoke.
efraim pushed a commit to branch core-updates in repository guix. commit efe0a4a2a7ece13c855a1f316ad49bcdbfa1596f Author: Efraim Flashner Date: Sat Nov 10 19:58:28 2018 +0200 gnu: dvd+rw-tools: Use invoke. * gnu/packages/cdrom.scm (dvd+rw-tools): Use 'invoke'. --- gnu/packages/cdrom.scm | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 992c204..ccb2766 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -303,14 +303,14 @@ images.") (replace 'configure (lambda _ (setenv "prefix" (assoc-ref %outputs "out")) #t)) (add-before 'build 'embed-mkisofs - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key inputs #:allow-other-keys) ;; We use sed --in-place because substitute* cannot handle the ;; character encoding used by growisofs.c. - (zero? (system* "sed" "-i" "-e" - (string-append - "s,\"mkisofs\"," - "\"" (which "mkisofs") "\",") - "growisofs.c"))) + (invoke "sed" "-i" "-e" + (string-append + "s,\"mkisofs\"," + "\"" (which "mkisofs") "\",") + "growisofs.c")) (home-page "http://fy.chalmers.se/~appro/linux/DVD+RW/;) (synopsis "DVD and Blu-ray Disc burning tools") (description "dvd+rw-tools, mostly known for its command
01/02: gnu: dvd+rw-tools: Fix building with glibc@2.28.
efraim pushed a commit to branch core-updates in repository guix. commit 2529c8381f622b78b02e53a4e95dd6ad65b1f8e4 Author: Efraim Flashner Date: Sat Nov 10 19:57:26 2018 +0200 gnu: dvd+rw-tools: Fix building with glibc@2.28. * gnu/packages/cdrom.scm (dvd+rw-tools)[arguments]: Add custom phase to add missing import. --- gnu/packages/cdrom.scm | 9 + 1 file changed, 9 insertions(+) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index d8dc9ee..992c204 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -291,6 +291,15 @@ images.") `(#:tests? #f ; No tests. #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-glibc-compatability + (lambda* (#:key inputs #:allow-other-keys) + ;; We use sed --in-place because substitute* cannot handle the + ;; character encoding used by growisofs.c. + (invoke "sed" "-i" "-e" + (string-append + "s,," + "\\\n#include ,") + "growisofs.c"))) (replace 'configure (lambda _ (setenv "prefix" (assoc-ref %outputs "out")) #t)) (add-before 'build 'embed-mkisofs
branch core-updates updated (efe0a4a -> f268b74)
efraim pushed a change to branch core-updates in repository guix. from efe0a4a gnu: dvd+rw-tools: Use invoke. new f268b74 gnu: lbzip2: Fix building with glibc@2.28. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/compression.scm | 18 +- 1 file changed, 17 insertions(+), 1 deletion(-)
branch core-updates updated (8754ea4 -> efe0a4a)
efraim pushed a change to branch core-updates in repository guix. from 8754ea4 gnu: f2fs-tools: Update to 1.11.0. new 2529c83 gnu: dvd+rw-tools: Fix building with glibc@2.28. new efe0a4a gnu: dvd+rw-tools: Use invoke. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/cdrom.scm | 21 +++-- 1 file changed, 15 insertions(+), 6 deletions(-)
01/03: gnu: lbzip2: Remove false comment.
efraim pushed a commit to branch core-updates
in repository guix.
commit 9829e0699b6b0373c1742393f18db261a6ae67a8
Author: Efraim Flashner
Date: Sat Nov 10 20:13:20 2018 +0200
gnu: lbzip2: Remove false comment.
This is a follow-up to f268b744b84734b374a15feae1f02b9f2c4085c7.
* gnu/packages/compression.scm (lbzip2)[source]: This snippet is, in
fact, a snippet.
---
gnu/packages/compression.scm | 3 ---
1 file changed, 3 deletions(-)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 41289ad..aa47fef 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -367,9 +367,6 @@ decompression.")
(modules '((guix build utils)))
(snippet
'(begin
- ;; Adjust the bundled gnulib to work with glibc 2.28. See
e.g.
- ;; "m4-gnulib-libio.patch". This is a phase rather than patch
- ;; or snippet to work around <https://bugs.gnu.org/32347>.
(substitute* (find-files "lib" "\\.c$")
(("#if defined _IO_ftrylockfile")
"#if defined _IO_EOF_SEEN"))
03/03: gnu: idutils: Fix building with glibc@2.28.
efraim pushed a commit to branch core-updates
in repository guix.
commit 1de2937283b3f19abf50af77f955a5dc4313755a
Author: Efraim Flashner
Date: Sat Nov 10 20:18:08 2018 +0200
gnu: idutils: Fix building with glibc@2.28.
* gnu/packages/idutils.scm (idutils)[source]: Add snippet to patch
bundled gnulib for glibc@2.28.
---
gnu/packages/idutils.scm | 16 +++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/idutils.scm b/gnu/packages/idutils.scm
index abab0c1..8171559 100644
--- a/gnu/packages/idutils.scm
+++ b/gnu/packages/idutils.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2015 Ludovic Courtès
+;;; Copyright © 208 Efraim Flashner
;;;
;;; This file is part of GNU Guix.
;;;
@@ -35,7 +36,20 @@
(sha256
(base32
"1hmai3422iaqnp34kkzxdnywl7n7pvlxp11vrw66ybxn9wxg90c1"))
- (patches (search-patches "diffutils-gets-undeclared.patch"
+ (patches (search-patches "diffutils-gets-undeclared.patch"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (substitute* (find-files "lib" "\\.c$")
+ (("#if defined _IO_ftrylockfile")
+"#if defined _IO_EOF_SEEN"))
+ (substitute* "lib/stdio-impl.h"
+ (("^/\\* BSD stdio derived implementations")
+(string-append "#if !defined _IO_IN_BACKUP && defined
_IO_EOF_SEEN\n"
+ "# define _IO_IN_BACKUP 0x100\n"
+ "#endif\n\n"
+ "/* BSD stdio derived implementations")))
+ #t
(build-system gnu-build-system)
(native-inputs `(("emacs" ,emacs-minimal)))
(home-page "https://www.gnu.org/software/idutils/;)
branch core-updates updated (f268b74 -> 1de2937)
efraim pushed a change to branch core-updates in repository guix. from f268b74 gnu: lbzip2: Fix building with glibc@2.28. new 9829e06 gnu: lbzip2: Remove false comment. new 211db9c gnu: sharutils: Remove false comment. new 1de2937 gnu: idutils: Fix building with glibc@2.28. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/compression.scm | 32 +--- gnu/packages/idutils.scm | 16 +++- 2 files changed, 28 insertions(+), 20 deletions(-)
02/03: gnu: sharutils: Remove false comment.
efraim pushed a commit to branch core-updates
in repository guix.
commit 211db9caf7ffdaa9f2abc7d6216f239f96312545
Author: Efraim Flashner
Date: Sat Nov 10 20:14:36 2018 +0200
gnu: sharutils: Remove false comment.
This is a follow-up to b50d58b3445a85bf4395e2b767da10c2e3438902.
* gnu/packages/compression.scm (sharutils)[source]: This snippet is, in
fact, a snippet.
---
gnu/packages/compression.scm | 29 +
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index aa47fef..5b09cb5 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -598,22 +598,19 @@ decompressors when faced with corrupted input.")
(sha256
(base32
"16isapn8f39lnffc3dp4dan05b7x6mnc76v6q5nn8ysxvvvwy19b"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Adjust the bundled gnulib to work with glibc 2.28. See
e.g.
- ;; "m4-gnulib-libio.patch". This is a phase rather than patch
- ;; or snippet to work around <https://bugs.gnu.org/32347>.
- (substitute* (find-files "lib" "\\.c$")
- (("#if defined _IO_ftrylockfile")
-"#if defined _IO_EOF_SEEN"))
- (substitute* "lib/stdio-impl.h"
- (("^/\\* BSD stdio derived implementations")
-(string-append "#if !defined _IO_IN_BACKUP && defined
_IO_EOF_SEEN\n"
- "# define _IO_IN_BACKUP 0x100\n"
- "#endif\n\n"
- "/* BSD stdio derived implementations")))
- #t
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (substitute* (find-files "lib" "\\.c$")
+(("#if defined _IO_ftrylockfile")
+ "#if defined _IO_EOF_SEEN"))
+ (substitute* "lib/stdio-impl.h"
+(("^/\\* BSD stdio derived implementations")
+ (string-append "#if !defined _IO_IN_BACKUP && defined
_IO_EOF_SEEN\n"
+"# define _IO_IN_BACKUP 0x100\n"
+"#endif\n\n"
+"/* BSD stdio derived implementations")))
+ #t
(build-system gnu-build-system)
(inputs
`(("which" ,which)))
branch core-updates updated (64461ba -> 8754ea4)
efraim pushed a change to branch core-updates in repository guix. from 64461ba Merge branch 'master' into core-updates new 8754ea4 gnu: f2fs-tools: Update to 1.11.0. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
01/01: gnu: f2fs-tools: Update to 1.11.0.
efraim pushed a commit to branch core-updates
in repository guix.
commit 8754ea483dbdac7eef8e885d6bd8c28b4a8a5373
Author: Efraim Flashner
Date: Sat Nov 10 19:26:09 2018 +0200
gnu: f2fs-tools: Update to 1.11.0.
* gnu/packages/linux.scm (f2fs-tools): Update to 1.11.0.
---
gnu/packages/linux.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index d4ea542..02d30ba 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3402,7 +3402,7 @@ disks and SD cards. This package provides the userland
utilities.")
(package
(inherit f2fs-tools-1.7)
(name "f2fs-tools")
-(version "1.10.0")
+(version "1.11.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3410,7 +3410,7 @@ disks and SD cards. This package provides the userland
utilities.")
"/f2fs-tools.git/snapshot/" name "-" version ".tar.gz"))
(sha256
(base32
-"05ikaim0qq3dx9x3sp43ralwz43r3b0viv62n99kabp0vf3b0hg8"
+"1qvr3hcic1vzfmyl7c0gnjxfsw8zjaadm66y337h49chv9yaq5mr"
(inputs
`(("libuuid" ,util-linux)
01/01: gnu: f2fs-tools: Update to 1.11.0.
efraim pushed a commit to branch master
in repository guix.
commit 005ec8d09c6b8f22457fad330c30ff0ccf495e34
Author: Efraim Flashner
Date: Sat Nov 10 19:26:09 2018 +0200
gnu: f2fs-tools: Update to 1.11.0.
* gnu/packages/linux.scm (f2fs-tools): Update to 1.11.0.
---
gnu/packages/linux.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e52c35f..9bf995b 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3402,7 +3402,7 @@ disks and SD cards. This package provides the userland
utilities.")
(package
(inherit f2fs-tools-1.7)
(name "f2fs-tools")
-(version "1.10.0")
+(version "1.11.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3410,7 +3410,7 @@ disks and SD cards. This package provides the userland
utilities.")
"/f2fs-tools.git/snapshot/" name "-" version ".tar.gz"))
(sha256
(base32
-"05ikaim0qq3dx9x3sp43ralwz43r3b0viv62n99kabp0vf3b0hg8"
+"1qvr3hcic1vzfmyl7c0gnjxfsw8zjaadm66y337h49chv9yaq5mr"
(inputs
`(("libuuid" ,util-linux)
branch master updated (03a4153 -> 005ec8d)
efraim pushed a change to branch master in repository guix. from 03a4153 gnu: r-ensembldb: Update to 2.6.1. new 005ec8d gnu: f2fs-tools: Update to 1.11.0. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
branch master updated (8fa9ace -> e340725)
efraim pushed a change to branch master in repository guix. from 8fa9ace doc: Add index entries. new 988b78b gnu: Add fstrcmp. new e340725 gnu: kodi: Update to 18.0b5. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/kodi.scm | 70 --- 1 file changed, 50 insertions(+), 20 deletions(-)
02/02: gnu: kodi: Update to 18.0b5.
efraim pushed a commit to branch master in repository guix. commit e3407254d5e23cfd2741b51d48297bad01864311 Author: Efraim Flashner Date: Thu Nov 8 11:55:38 2018 +0200 gnu: kodi: Update to 18.0b5. * gnu/packages/kodi.scm (kodi): Update to 18.0b5. [source]: Update snippet. [inputs]: Add flatbuffers, fstrcmp. (crossguid): Update to commit fef89a4174a7bf8cd99fa9154864ce9e8e3bf989. (libdvdnav/kodi, libdvdread/kodi): Update to 6.0.0-Leia-Alpha-3. (libdvdcss/kodi): Update to 1.4.2-Leia-Beta-5. --- gnu/packages/kodi.scm | 39 +++ 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index f0aa3bd..fe7f93f 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -64,6 +64,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages samba) #:use-module (gnu packages sdl) + #:use-module (gnu packages serialization) #:use-module (gnu packages ssh) #:use-module (gnu packages swig) #:use-module (gnu packages textutils) @@ -77,11 +78,12 @@ #:use-module (gnu packages assembly)) (define-public crossguid - (let ((commit "8f399e8bd4252be9952f3dfa8199924cc8487ca4")) + (let ((commit "fef89a4174a7bf8cd99fa9154864ce9e8e3bf989") +(revision "2")) (package (name "crossguid") - (version (string-append "0.0-1." (string-take commit 7))) - ;; There's no official release. Just a Git repository. + (version (string-append "0.0-" revision "." (string-take commit 7))) + ;; This is the commit that Kodi wants. (source (origin (method git-fetch) (uri (git-reference @@ -90,13 +92,12 @@ (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1i29y207qqddvaxbn39pk2fbh3gx8zvdprfp35wasj9rw2wjk3s9" + "1blrkc7zcqrqcr5msvhyhm98s2jvm9hr0isqs4288q2r4mdnrfq0" (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure) ; no configure script - ;; There's no build system here, so we have to do it ourselves. (replace 'build (lambda _ (invoke "g++" "-c" "guid.cpp" "-o" "guid.o" @@ -131,7 +132,7 @@ generator library for C++.") ;; of the standard build process. To make things easier, we bootstrap ;; and patch shebangs here, so we don't have to worry about it later. (define libdvdnav/kodi - (let ((commit "6.0.0-Leia-Alpha-1")) + (let ((commit "6.0.0-Leia-Alpha-3")) (package (name "libdvdnav-bootstrapped") (version commit) @@ -143,7 +144,7 @@ generator library for C++.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1xiyfgf8v8aknlxlzsvk6pbzkhclz0hbh3s1b0w6ivkng2k310j9" + "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb" (build-system gnu-build-system) (arguments '(#:tests? #f @@ -166,7 +167,7 @@ generator library for C++.") (license license:gpl2+ (define libdvdread/kodi - (let ((commit "6.0.0-Leia-Alpha-1")) + (let ((commit "6.0.0-Leia-Alpha-3")) (package (name "libdvdread-bootstrapped") (version commit) @@ -178,7 +179,7 @@ generator library for C++.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1c3g18n2vwhgcfz3dka1pmw58bnv2ram7xjvizfiykb3sgi9zfwp" + "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59" (build-system gnu-build-system) (arguments '(#:tests? #f @@ -201,7 +202,7 @@ generator library for C++.") (license (list license:gpl2+ license:lgpl2.1+) (define libdvdcss/kodi - (let ((commit "1.4.1-Leia-Alpha-1")) + (let ((commit "1.4.2-Leia-Beta-5")) (package (name "libdvdcss-bootstrapped") (version commit) @@ -213,7 +214,7 @@ generator library for C++.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0adafwsawxssj3nilkql447v0l4a2584rdpmy5rfjmznh91lykgh" + "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl" (build-system gnu-build-system) (arguments '(#:tests? #f @@ -265,27 +266,23 @@ alternatives. In compilers, this
01/02: gnu: Add fstrcmp.
efraim pushed a commit to branch master
in repository guix.
commit 988b78ba28b5104407ec14e6f07ab80df31d17d8
Author: Efraim Flashner
Date: Thu Nov 8 11:53:03 2018 +0200
gnu: Add fstrcmp.
* gnu/packages/kodi.scm (fstrcmp): New variable.
---
gnu/packages/kodi.scm | 31 +++
1 file changed, 31 insertions(+)
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index 6729f1f..f0aa3bd 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2017 Marius Bakke
;;; Copyright © 2017 Oleg Pykhalov
;;; Copyright © 2018 Tobias Geerinckx-Rice
+;;; Copyright © 2018 Efraim Flashner
;;;
;;; This file is part of GNU Guix.
;;;
@@ -48,6 +49,7 @@
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages gperf)
+ #:use-module (gnu packages groff)
#:use-module (gnu packages gnunet)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages image)
@@ -233,6 +235,35 @@ generator library for C++.")
(description (package-description libdvdcss))
(license license:gpl2+
+(define-public fstrcmp
+ (package
+(name "fstrcmp")
+(version "0.7.D001")
+(source
+ (origin
+(method url-fetch)
+(uri (string-append "http://fstrcmp.sourceforge.net/fstrcmp-;
+version ".tar.gz"))
+(sha256
+ (base32
+ "0xilghiy3mz78bjmfldi39qyy7jvw5b6wafsx370lw401y2qw0g4"
+(build-system gnu-build-system)
+(home-page "http://fstrcmp.sourceforge.net/;)
+(arguments
+ '(#:configure-flags '("SH=sh")))
+(native-inputs
+ `(("ghostscript" ,ghostscript) ; ps2pdf
+ ("groff" ,groff)
+ ("libtool" ,libtool)
+ ("which" ,which)))
+(synopsis "fuzzy comparison of strings")
+(description
+ "The fstrcmp project provides a library that is used to make fuzzy
+comparisons of strings and byte arrays, including multi-byte character strings.
+This can be useful in error messages, enabling the suggestion of likely valid
+alternatives. In compilers, this can reduce the cascade of secondary errors.")
+(license license:gpl3+)))
+
(define-public kodi
;; We package the git version because the current released
;; version was cut while the cmake transition was in turmoil.
branch master updated (ea68b3f -> b44b1f0)
efraim pushed a change to branch master in repository guix. from ea68b3f pull: Add missing monadic 'return'. new b44b1f0 gnu: hplip: Remove bundled non-free blobs. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/local.mk | 1 + gnu/packages/cups.scm | 6 +- .../patches/hplip-remove-imageprocessor.patch | 232 + 3 files changed, 238 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/hplip-remove-imageprocessor.patch
01/01: gnu: hplip: Remove bundled non-free blobs.
efraim pushed a commit to branch master
in repository guix.
commit b44b1f08f6945ea8370746cfdadb44c7dea9ea3e
Author: Efraim Flashner
Date: Wed Nov 7 23:13:02 2018 +0200
gnu: hplip: Remove bundled non-free blobs.
This fixes <https://bugs.gnu.org/32184>.
* gnu/packages/cups.scm (hplip)[source]: Add patch. Update snippet to
remove non-free code and binary blobs.
* gnu/packages/patches/hplip-remove-imageprocessor.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
gnu/local.mk | 1 +
gnu/packages/cups.scm | 6 +-
.../patches/hplip-remove-imageprocessor.patch | 232 +
3 files changed, 238 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 9a8330a..c627577 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -808,6 +808,7 @@ dist_patch_DATA =
\
%D%/packages/patches/higan-remove-march-native-flag.patch\
%D%/packages/patches/hubbub-sort-entities.patch \
%D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch\
+ %D%/packages/patches/hplip-remove-imageprocessor.patch \
%D%/packages/patches/hydra-disable-darcs-test.patch \
%D%/packages/patches/icecat-avoid-bundled-libraries.patch\
%D%/packages/patches/icecat-CVE-2018-12383.patch \
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 4259648..04a533d 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -405,9 +405,13 @@ device-specific programs to convert and print many types
of files.")
(base32
"0g3q5mm2crjyc1z4z6gv4lam6sc5d3diz704djrnpqadk4q3h290"))
(modules '((guix build utils)))
+ (patches (search-patches "hplip-remove-imageprocessor.patch"))
(snippet
- ;; Fix type mismatch.
'(begin
+ ;; Delete non-free blobs
+ (for-each delete-file (find-files "." "\\.so$"))
+ (delete-file "prnt/hpcups/ImageProcessor.h")
+ ;; Fix type mismatch.
(substitute* "prnt/hpcups/genPCLm.cpp"
(("boolean") "bool"))
#t
diff --git a/gnu/packages/patches/hplip-remove-imageprocessor.patch
b/gnu/packages/patches/hplip-remove-imageprocessor.patch
new file mode 100644
index 000..cde3ecb
--- /dev/null
+++ b/gnu/packages/patches/hplip-remove-imageprocessor.patch
@@ -0,0 +1,232 @@
+This patch is based heavily on the Debian patch.
+
+https://salsa.debian.org/printing-team/hplip/raw/debian/3.18.10+dfsg0-1/debian/patches/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
+
+---
+ Makefile.am | 22 +++---
+ Makefile.in | 33 +
+ prnt/hpcups/HPCupsFilter.cpp | 21 -
+ 3 files changed, 8 insertions(+), 68 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index ef6480f..ecada5c 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -166,7 +166,7 @@ if !HPLIP_CLASS_DRIVER
+ dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
+ endif #HPLIP_CLASS_DRIVER
+
+-dist_noinst_DATA += prnt/drv/hpijs.drv.in.template
prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so
prnt/hpcups/libImageProcessor-x86_32.so
++dist_noinst_DATA += prnt/drv/hpijs.drv.in.template
prnt/drv/hpcups.drv.in.template
+ dist_noinst_SCRIPTS += dat2drv.py install.py hplip-install
init-suse-firewall init-iptables-firewall class_rpm_build.sh
hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv
+
+ if !HPLIP_CLASS_DRIVER
+@@ -590,11 +590,10 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp
prnt/hpcups/HPCupsFilter.h prnt/hp
+ prnt/hpcups/flate_colorspace.h prnt/hpcups/RunLenEncoding.h
prnt/hpcups/common_defines.h \
+ prnt/hpcups/genPCLm.h \
+ common/utils.c common/utils.h prnt/hpcups/Hbpl1_Wrapper.cpp
prnt/hpcups/genPCLm.cpp \
+- prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp \
+- prnt/hpcups/ImageProcessor.h
++ prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp
+
+ hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
+-hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups
-lcupsimage -lz $(DBUS_LIBS)
++hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz
$(DBUS_LIBS)
+ #else
+ #hpcupsdir = $(cupsfilterdir)
+ #hpcups_PROGRAMS = hpcups
+@@ -679,21 +678,10 @@ printpluginsdir=$(cupsfilterdir)
+
+
+ dist_filter_DATA = hpcups hpps dat2drv
+-dist_printplugins_DATA = prnt/plugins/hbpl1-arm32.so
prnt/plugins/hbpl1-arm64.so prnt/plugins/hbpl1-x86_32.so
prnt/plugins/hbpl1-x86_64.so prnt/plugins/lj-arm32.so prnt/plugins/lj-arm64.so
prnt/plugins/lj-x86_32.so prn
branch master updated (02e2133 -> cbb5d2e)
efraim pushed a change to branch master in repository guix. from 02e2133 gnu: LibreOffice: Update to 6.1.3.2. new cbb5d2e gnu: kodi: Fix typo. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/kodi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
01/01: gnu: kodi: Fix typo.
efraim pushed a commit to branch master
in repository guix.
commit cbb5d2e14582ad825e94a2e1f13cc6c74923894f
Author: Efraim Flashner
Date: Wed Nov 7 10:37:58 2018 +0200
gnu: kodi: Fix typo.
This is a follow-up to 2c17bd7b2955beef4130d11b33e07e4fb3b234dc.
* gnu/packages/kodi.scm (kodi)[arguments]: Remove unwanted symbols.
---
gnu/packages/kodi.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index 21e7b12..6729f1f 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -317,8 +317,8 @@ generator library for C++.")
(string-append (assoc-ref inputs "tzdata")
"/share/zoneinfo")))
- ;; Don't phone home to check for updates.¬
- (substitute* "system/addon-manifest.xml"¬
+ ;; Don't phone home to check for updates.
+ (substitute* "system/addon-manifest.xml"
(("service.xbmc.versioncheck")
""))
branch master updated (b588adc -> 730e5fb)
efraim pushed a change to branch master in repository guix. from b588adc gnu: c-ares: Update to 1.15.0. new 730e5fb Revert "gnu: c-ares: Update to 1.15.0." The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/adns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
01/01: Revert "gnu: c-ares: Update to 1.15.0."
efraim pushed a commit to branch master
in repository guix.
commit 730e5fbc66461e91981898272edd5a3d326e2f9d
Author: Efraim Flashner
Date: Tue Nov 6 12:22:02 2018 +0200
Revert "gnu: c-ares: Update to 1.15.0."
c-ares has more than 3000 dependant packages.
This reverts commit b588adc96feec4498857ecb6d3537f746b0c0463.
---
gnu/packages/adns.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/adns.scm b/gnu/packages/adns.scm
index ce89c2f..6e3af8b 100644
--- a/gnu/packages/adns.scm
+++ b/gnu/packages/adns.scm
@@ -59,7 +59,7 @@ scripts.")
(define-public c-ares
(package
(name "c-ares")
-(version "1.15.0")
+(version "1.14.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -67,7 +67,7 @@ scripts.")
".tar.gz"))
(sha256
(base32
-"0lk8knip4xk6qzksdkn7085mmgm4ixfczdyyjw656c193y3rgnvc"
+"0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5"
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
01/01: gnu: c-ares: Update to 1.15.0.
efraim pushed a commit to branch master
in repository guix.
commit b588adc96feec4498857ecb6d3537f746b0c0463
Author: Efraim Flashner
Date: Sun Nov 4 20:42:48 2018 +0200
gnu: c-ares: Update to 1.15.0.
* gnu/packages/adns.scm (c-ares): Update to 1.15.0.
---
gnu/packages/adns.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/adns.scm b/gnu/packages/adns.scm
index 6e3af8b..ce89c2f 100644
--- a/gnu/packages/adns.scm
+++ b/gnu/packages/adns.scm
@@ -59,7 +59,7 @@ scripts.")
(define-public c-ares
(package
(name "c-ares")
-(version "1.14.0")
+(version "1.15.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -67,7 +67,7 @@ scripts.")
".tar.gz"))
(sha256
(base32
-"0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5"
+"0lk8knip4xk6qzksdkn7085mmgm4ixfczdyyjw656c193y3rgnvc"
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
branch master updated (7f860a8 -> b588adc)
efraim pushed a change to branch master in repository guix. from 7f860a8 gnu: services: dns: Fix 'ddclient-activation'. new b588adc gnu: c-ares: Update to 1.15.0. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/adns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
01/01: gnu: myrepos: Wrap the webcheckout binary.
efraim pushed a commit to branch master
in repository guix.
commit 30012b74088dccbb602e3592c61a5718fc5e5524
Author: Efraim Flashner
Date: Sun Nov 4 12:45:04 2018 +0200
gnu: myrepos: Wrap the webcheckout binary.
* gnu/packages/version-control.scm (myrepos)[arguments]: Add a custom
'wrap-webcheckout phase to wrap webcheckout with its perl libraries.
[inputs]: Add perl-encode-locale, perl-html-parser, perl-http-date,
perl-http-message, perl-libwww, perl-try-tiny, perl-uri.
---
gnu/packages/version-control.scm | 28
1 file changed, 24 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index df0b2f0..632a43f 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1741,12 +1741,32 @@ modification time.")
(sha256
(base32 "0jphw61plm8cgklja6hs639xhdvxgvjwbr6jpvjwpp7hc5gmhms5"
(build-system gnu-build-system)
-(inputs
- `(("perl" ,perl)))
(arguments
'(#:test-target "test"
- #:phases (modify-phases %standard-phases (delete 'configure))
- #:make-flags (list (string-append "PREFIX=" %output
+ #:make-flags (list (string-append "PREFIX=" %output))
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (add-after 'install 'wrap-webcheckout
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (wrap-program (string-append out "/bin/webcheckout")
+ `("PERL5LIB" ":" prefix
+ ,(map (lambda (i) (string-append (assoc-ref inputs i)
+"/lib/perl5/site_perl"))
+ '("perl-encode-locale" "perl-http-date"
+ "perl-http-message" "perl-html-parser" "perl-libwww"
+ "perl-uri" "perl-try-tiny"
+ #t))
+(inputs
+ `(("perl" ,perl)
+ ("perl-encode-locale" ,perl-encode-locale)
+ ("perl-html-parser" ,perl-html-parser)
+ ("perl-http-date" ,perl-http-date)
+ ("perl-http-message" ,perl-http-message)
+ ("perl-libwww" ,perl-libwww)
+ ("perl-try-tiny" ,perl-try-tiny)
+ ("perl-uri" ,perl-uri)))
(home-page "https://myrepos.branchable.com/;)
(synopsis "Multiple repository management tool")
(description
branch master updated (f909e21 -> 30012b7)
efraim pushed a change to branch master in repository guix. from f909e21 gnu: debian-archive-keyring: Update to 2018.1. new 30012b7 gnu: myrepos: Wrap the webcheckout binary. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/version-control.scm | 28 1 file changed, 24 insertions(+), 4 deletions(-)
branch master updated (3e84ce5 -> f909e21)
efraim pushed a change to branch master in repository guix. from 3e84ce5 gnu: mpop: Update to 1.4.0. new d4b5e4b gnu: debootstrap: Update to 1.0.109. new 2e77bbe gnu: ruby@2.3: Update to 2.3.8. new f909e21 gnu: debian-archive-keyring: Update to 2018.1. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/debian.scm | 16 +--- gnu/packages/ruby.scm | 6 +++--- 2 files changed, 12 insertions(+), 10 deletions(-)
01/03: gnu: debootstrap: Update to 1.0.109.
efraim pushed a commit to branch master in repository guix. commit d4b5e4bb7377a31196b392c93b0072aed9cc969a Author: Efraim Flashner Date: Sun Nov 4 11:48:04 2018 +0200 gnu: debootstrap: Update to 1.0.109. * gnu/packages/debian.scm (debootstrap): Update to 1.0.109. --- gnu/packages/debian.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 5ea2631..16b5d21 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -116,7 +116,7 @@ contains the archive keys used for that.") (define-public debootstrap (package (name "debootstrap") -(version "1.0.106") +(version "1.0.109") (source (origin (method git-fetch) @@ -126,7 +126,7 @@ contains the archive keys used for that.") (file-name (git-file-name name version)) (sha256 (base32 - "1fm5bgllcwgwizrqi4sn8p4fpbzhbzgwprrfppfq9hqdzbmlfmnv" + "0bjqlyg605lnsjcn3wjplc6jl75nx7c6miyac2qsahi484rylg5g" (build-system gnu-build-system) (arguments `(#:phases
02/03: gnu: ruby@2.3: Update to 2.3.8.
efraim pushed a commit to branch master in repository guix. commit 2e77bbed719cfaa43d704e555a9007c5c4d52d2f Author: Efraim Flashner Date: Sun Nov 4 11:48:36 2018 +0200 gnu: ruby@2.3: Update to 2.3.8. * gnu/packages/ruby.scm (ruby@2.3): Update to 2.3.8. --- gnu/packages/ruby.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7e8c8be..bdcc321 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015, 2016, 2017 Ben Woodcroft ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2017 Marius Bakke -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Clément Lassieur ;;; @@ -110,7 +110,7 @@ a focus on simplicity and productivity.") (define-public ruby-2.3 (package (inherit ruby) -(version "2.3.7") +(version "2.3.8") (source (origin (method url-fetch) @@ -119,7 +119,7 @@ a focus on simplicity and productivity.") "/ruby-" version ".tar.xz")) (sha256 (base32 - "1nwfaifq5624p1ml56qq5dy5w38z37x22r0qgrbgbzrzklmqy7y6")) + "1zhxbjff08pvbnxvn58krns6q0p6g4977q6ykfn823gxhifn63wi")) (modules '((guix build utils))) (snippet `(begin ;; Remove bundled libffi
03/03: gnu: debian-archive-keyring: Update to 2018.1.
efraim pushed a commit to branch master in repository guix. commit f909e2179715ea1cf7d381810c2de5dcfedfb45e Author: Efraim Flashner Date: Sun Nov 4 11:54:39 2018 +0200 gnu: debian-archive-keyring: Update to 2018.1. * gnu/packages/debian.scm (debian-archive-keyring): Update to 2018.1. [source]: Download from git repository. --- gnu/packages/debian.scm | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 16b5d21..622c77b 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -33,15 +33,17 @@ (define-public debian-archive-keyring (package (name "debian-archive-keyring") -(version "2017.7") +(version "2018.1") (source (origin -(method url-fetch) -(uri (string-append "mirror://debian/pool/main/d/" name "/" -name "_" version ".tar.xz")) +(method git-fetch) +(uri (git-reference + (url "https://salsa.debian.org/release-team/debian-archive-keyring.git;) + (commit version))) +(file-name (git-file-name name version)) (sha256 (base32 - "1pdwgipfi0y4svhxlw8arhq792f1g3vlmw4raphizy7sa65vd4ca" + "136vr5dj7w0dz563qdghsndcfcqm2m8d4j1dyiq9dzx5vd0rcpcw" (build-system gnu-build-system) (arguments '(#:test-target "verify-results"
branch master updated (0e091b3 -> e9f305a)
efraim pushed a change to branch master in repository guix. from 0e091b3 gnu: totem: Update to 3.26.2. new e9f305a gnu: sbcl-lift: Don't keep the bundled website. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/lisp.scm | 18 -- 1 file changed, 8 insertions(+), 10 deletions(-)
01/01: gnu: sbcl-lift: Don't keep the bundled website.
efraim pushed a commit to branch master
in repository guix.
commit e9f305a1c82abe17cc67f0b349fcf09e7a002090
Author: Efraim Flashner
Date: Sat Nov 3 20:37:27 2018 +0200
gnu: sbcl-lift: Don't keep the bundled website.
* gnu/packages/lisp.scm (sbcl-lift)[source]: Remove bundled website.
[arguments]: Remove custom 'make-gzips-writable phase.
---
gnu/packages/lisp.scm | 18 --
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index c323809..9fb25a1 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -2382,19 +2382,17 @@ new fiends in addition to old friends like
@command{aif} and
(sha256
(base32
"127v5avpz1i4m0lkaxqrq8hrl69rdazqaxf6s8awf0nd7wj2g4dp"))
- (file-name (git-file-name "lift" version
+ (file-name (git-file-name "lift" version))
+ (modules '((guix build utils)))
+ (snippet
+ ;; Don't keep the bundled website
+ `(begin
+ (delete-file-recursively "website")
+ #t
(build-system asdf-build-system/sbcl)
(arguments
;; The tests require a debugger, but we run with the debugger disabled.
- '(#:tests? #f
- #:phases
- (modify-phases %standard-phases
- ;; Do this to ensure the 'reset-gzip-timestamps phase works.
- (add-after 'unpack 'make-gzips-writeable
- (lambda _
- (for-each (lambda (file)
- (chmod file #o755))
- (find-files "." "\\.gz$")))
+ '(#:tests? #f))
(synopsis "LIsp Framework for Testing")
(description
"The LIsp Framework for Testing (LIFT) is a unit and system test tool
for LISP.
01/01: gnu: myrepos: Update to 1.20180726.
efraim pushed a commit to branch master
in repository guix.
commit c16913d34df610f5e1560ab8da953e32b3a4e7d7
Author: Efraim Flashner
Date: Wed Oct 31 21:56:36 2018 +0200
gnu: myrepos: Update to 1.20180726.
* gnu/packages/version-control.scm (myrepos): Update to 1.20180726.
[source]: Remove patch.
* gnu/packages/patches/myrepos-CVE-2018-7032.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
gnu/local.mk | 1 -
gnu/packages/patches/myrepos-CVE-2018-7032.patch | 69
gnu/packages/version-control.scm | 5 +-
3 files changed, 2 insertions(+), 73 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 6075e47..3207cec 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -973,7 +973,6 @@ dist_patch_DATA =
\
%D%/packages/patches/mupen64plus-ui-console-notice.patch \
%D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch\
%D%/packages/patches/mutt-store-references.patch \
- %D%/packages/patches/myrepos-CVE-2018-7032.patch \
%D%/packages/patches/net-tools-bitrot.patch \
%D%/packages/patches/netcdf-date-time.patch \
%D%/packages/patches/netcdf-tst_h_par.patch \
diff --git a/gnu/packages/patches/myrepos-CVE-2018-7032.patch
b/gnu/packages/patches/myrepos-CVE-2018-7032.patch
deleted file mode 100644
index ce9493e..000
--- a/gnu/packages/patches/myrepos-CVE-2018-7032.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-http://source.myrepos.branchable.com/?p=source.git;a=patch;h=40a3df21c73f1bb1b6915cc6fa503f50814664c8
-This can be removed with the next release. It was modified slightly to apply
-
-From 40a3df21c73f1bb1b6915cc6fa503f50814664c8 Mon Sep 17 00:00:00 2001
-From: Paul Wise
-Date: Sun, 11 Feb 2018 21:57:49 +0800
-Subject: [PATCH] Mitigate vulnerabilities caused by some git remotes being
- able to execute code
-
-Set GIT_PROTOCOL_FROM_USER=0 with git versions newer than 2.12.
-
-Prevent remote websites from causing cloning of local repositories.
-
-Manually whitelist known-safe protocols (http, https, git, ssh)
-when using git versions older than 2.12.
-
-Fixes: CVE-2018-7032
-Fixes: https://bugs.debian.org/840014
-Suggestions-by: Jakub Wilk
-Reported-by: Jakub Wilk
- webcheckout | 22 +-
- 1 file changed, 21 insertions(+), 1 deletion(-)
-
-diff --git a/webcheckout b/webcheckout
-index e98da5c..de497ba 100755
a/webcheckout
-+++ b/webcheckout
-@@ -71,6 +71,16 @@ use Getopt::Long;
- use warnings;
- use strict;
-
-+# Mitigate some git remote types being dangerous
-+my $git_unsafe = 1;
-+my $git_version = `git --version`;
-+$git_version =~ s{^git version }{};
-+my ($major, $minor) = split(/\./, $git_version);
-+if (int($major) >= 2 && int($minor) >= 12) {
-+ $ENV{GIT_PROTOCOL_FROM_USER} = 0;
-+ $git_unsafe = 0;
-+}
-+
- # What to download.
- my $url;
-
-@@ -89,7 +99,17 @@ my $destdir;
-
- # how to perform checkouts
- my %handlers=(
-- git => sub { doit("git", "clone", shift, $destdir) },
-- svn => sub { doit("svn", "checkout", shift, $destdir) },
-- bzr => sub { doit("bzr", "branch", shift, $destdir) },
-+ git => sub {
-+ my $git_url = shift;
-+ # Reject unsafe URLs with older versions of git
-+ # that do not already check the URL safety.
-+ if ($git_unsafe && $git_url !~
m{^(?:(?:https?|git|ssh):[^:]|(?:[-_.A-Za-z0-9]+@)?[-_.A-Za-z0-9]+:(?!:|//))}) {
-+ print STDERR "potentially unsafe git URL, may fail,
touch local files or execute arbitrary code\n";
-+ return 1;
-+ }
-+ # Reject cloning local directories too, webcheckout is for
remote repos
-+ doit(qw(git -c protocol.file.allow=user clone --), $git_url,
$destdir)
-+ },
-+ svn => sub { doit(qw(svn checkout --), shift, $destdir) },
-+ bzr => sub { doit(qw(bzr branch --), shift, $destdir) },
- );
---
-2.11.0
-
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index ccb1f5d..df0b2f0 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1730,7 +1730,7 @@ modification time.")
(define-public myrepos
(package
(name "myrepos")
-(version "1.20171231")
+(version "1.20180726")
(source
(origin
(method git-fetch)
@@ -1739,8 +1739,7 @@ modification time.")
(commit version)))
(file-name (string-append name "-" version "-checkout"))
(sha256
-(base32 "10q7lpx152xnkk701fscn4dq99q9znnmv3bc2482khhjg7z8rps0"))
- (patches (search-patches "myrepos-CVE-2018-7032.patch"
+(base32 "0jphw61plm8cgklja6hs639xhdvxgvjwbr6jpvjwpp7hc5gmhms5"
(build-system gnu-build-system)
(inputs
`(("perl" ,perl)))
branch master updated (c438e0c -> c16913d)
efraim pushed a change to branch master in repository guix. from c438e0c gnu: curl: Update grafted replacement to 7.62.0 [security fixes]. new c16913d gnu: myrepos: Update to 1.20180726. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/local.mk | 1 - gnu/packages/patches/myrepos-CVE-2018-7032.patch | 69 gnu/packages/version-control.scm | 5 +- 3 files changed, 2 insertions(+), 73 deletions(-) delete mode 100644 gnu/packages/patches/myrepos-CVE-2018-7032.patch
06/06: gnu: zathura-pdf-mupdf: Simplify arguments.
efraim pushed a commit to branch master
in repository guix.
commit a6f2afeee185ee281576491b06ff37fe93df
Author: Efraim Flashner
Date: Tue Oct 30 11:10:07 2018 +0200
gnu: zathura-pdf-mupdf: Simplify arguments.
* gnu/packages/pdf.scm (zathura-pdf-mupdf)[arguments]: Remove custom
'patch-plugin-directory phase, replacd with configure-flag.
---
gnu/packages/pdf.scm | 14 +++---
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 4c3e983..1d37de7 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -435,17 +435,9 @@ using the DjVuLibre library.")
(build-system meson-build-system)
(arguments
`(#:tests? #f ; package does not contain tests
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-plugin-directory
- ;; Something of a regression in 0.3.3: the new Meson build system
- ;; now hard-codes an incorrect plugin directory. Fix it.
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "meson.build"
- (("(install_dir:).*" _ key)
-(string-append key
- "'" (assoc-ref outputs "out")
"/lib/zathura'\n")))
- #t)
+ #:configure-flags (list (string-append "-Dplugindir="
+ (assoc-ref %outputs "out")
+ "/lib/zathura"
(home-page "https://pwmt.org/projects/zathura-pdf-mupdf/;)
(synopsis "PDF support for zathura (mupdf backend)")
(description "The zathura-pdf-mupdf plugin adds PDF support to zathura
01/06: gnu: mujs: Update to 1.0.5.
efraim pushed a commit to branch master in repository guix. commit 1371e2250ad04d658a6d85b3ded1c607a4090f2d Author: Efraim Flashner Date: Tue Oct 30 11:03:06 2018 +0200 gnu: mujs: Update to 1.0.5. * gnu/packages/javascript.scm (mujs): Update to 1.0.5. --- gnu/packages/javascript.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 75517ca..b2bbe8e 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. @@ -413,7 +413,7 @@ external server.") (define-public mujs (package (name "mujs") -(version "1.0.4") +(version "1.0.5") (source (origin (method git-fetch) (uri (git-reference @@ -422,7 +422,7 @@ external server.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 -"1ly0yybs66nk63517kg4dmdc7dbikhqqqf2r2kvccgzzvv6k0vs8" +"0pkv26jxwgv5ax0ylfmi4h96h79hj4gvr95218ns8wngnmgr1ny6" (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases
02/06: gnu: mujs: Install shared library.
efraim pushed a commit to branch master in repository guix. commit f8ddf719f3b4005b0cff0d36a82d23c07f2c2913 Author: Efraim Flashner Date: Tue Oct 30 11:03:48 2018 +0200 gnu: mujs: Install shared library. * gnu/packages/javascript.scm (mujs)[arguments]: Add custom phase to install libmujs.so. --- gnu/packages/javascript.scm | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index b2bbe8e..8731a44 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -425,8 +425,14 @@ external server.") "0pkv26jxwgv5ax0ylfmi4h96h79hj4gvr95218ns8wngnmgr1ny6" (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (delete 'configure)) ; no configure + '(#:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure + (add-after 'install 'install-shared-library + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "build/release/libmujs.so" + (string-append out "/lib")) #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")) (string-append "CC=gcc")) #:tests? #f)); no tests
branch master updated (a2717e6 -> a6f2afe)
efraim pushed a change to branch master in repository guix. from a2717e6 gnu: calcurse: Use HTTPS URLs. new 1371e22 gnu: mujs: Update to 1.0.5. new f8ddf71 gnu: mujs: Install shared library. new b1435fe gnu: mupdf: Update to 1.14. new e726f09 gnu: mupdf: Update license list. new 24fc8f0 gnu: zathura-pdf-mupdf: Update to 0.3.4. new a6f2afe gnu: zathura-pdf-mupdf: Simplify arguments. The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/local.mk | 1 - gnu/packages/javascript.scm| 16 +-- .../zathura-pdf-mupdf-link-to-jpeg-libraries.patch | 55 -- gnu/packages/pdf.scm | 42 + 4 files changed, 34 insertions(+), 80 deletions(-) delete mode 100644 gnu/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch
03/06: gnu: mupdf: Update to 1.14.
efraim pushed a commit to branch master
in repository guix.
commit b1435fe735171c340bc8309209edd2a37c6e5aae
Author: Efraim Flashner
Date: Tue Oct 30 11:06:25 2018 +0200
gnu: mupdf: Update to 1.14.
* gnu/packages/pdf.scm (mupdf): Update to 1.14.
[source]: Don't remove all the bundled libraries.
[arguments]: Add 'configure-flags to use system libraries.
---
gnu/packages/pdf.scm | 16 +---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index e71f814..0dc8ef1 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -596,7 +596,7 @@ extracting content or merging files.")
(define-public mupdf
(package
(name "mupdf")
-(version "1.13.0")
+(version "1.14.0")
(source
(origin
(method url-fetch)
@@ -604,9 +604,17 @@ extracting content or merging files.")
name "-" version "-source.tar.xz"))
(sha256
(base32
- "0129k92bav692l6lyw10ryldx7h2f9khjpgnp3f3n4fdsph9hrkl"))
+ "1psnz02w5p7wc1s1ma7vvjmkjfy641xvsh9ykaqzkk84dflnjgk0"))
(modules '((guix build utils)))
-(snippet '(begin (delete-file-recursively "thirdparty") #t
+(snippet
+ ;; We keep lcms2 since it is different than our lcms.
+ '(begin
+(for-each
+ (lambda (dir)
+(delete-file-recursively (string-append "thirdparty/" dir)))
+ '("curl" "freeglut" "freetype" "harfbuzz" "jbig2dec"
+"libjpeg" "mujs" "openjpeg" "zlib"))
+#t
(build-system gnu-build-system)
(inputs
`(("curl" ,curl)
@@ -627,6 +635,8 @@ extracting content or merging files.")
'(#:tests? #f ; no check target
#:make-flags (list "CC=gcc"
"XCFLAGS=-fpic"
+ "USE_SYSTEM_LIBS=yes"
+ "USE_SYSTEM_MUJS=yes"
(string-append "prefix=" (assoc-ref %outputs
"out")))
#:phases (modify-phases %standard-phases
(delete 'configure
04/06: gnu: mupdf: Update license list.
efraim pushed a commit to branch master
in repository guix.
commit e726f0939e8b015d27203e11a92208323c29a163
Author: Efraim Flashner
Date: Tue Oct 30 11:12:57 2018 +0200
gnu: mupdf: Update license list.
* gnu/packages/pdf.scm (mupdf)[license]: Update the license list.
---
gnu/packages/pdf.scm | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 0dc8ef1..061a65a 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -651,7 +651,11 @@ listing the table of contents and hyperlinks.
The library ships with a rudimentary X11 viewer, and a set of command
line tools for batch rendering @command{pdfdraw}, rewriting files
@command{pdfclean}, and examining the file structure @command{pdfshow}.")
-(license license:agpl3+)))
+(license (list license:agpl3+
+ license:bsd-3 ; resources/cmaps
+ license:x11 ; thirdparty/lcms2
+ license:silofl1.1 ; resources/fonts/{han,noto,sil,urw}
+ license:asl2.0 ; resources/fonts/droid
(define-public qpdf
(package
05/06: gnu: zathura-pdf-mupdf: Update to 0.3.4.
efraim pushed a commit to branch master
in repository guix.
commit 24fc8f055df2138eaea74589c7f04793812f7bd8
Author: Efraim Flashner
Date: Tue Oct 30 11:08:10 2018 +0200
gnu: zathura-pdf-mupdf: Update to 0.3.4.
* gnu/packages/pdf.scm (zathura-pdf-mupdf): Update to 0.3.4.
[source]: Remove patch.
* gnu/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch:
Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
gnu/local.mk | 1 -
.../zathura-pdf-mupdf-link-to-jpeg-libraries.patch | 55 --
gnu/packages/pdf.scm | 6 +--
3 files changed, 2 insertions(+), 60 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 56c434d..5f72879 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1246,7 +1246,6 @@ dist_patch_DATA =
\
%D%/packages/patches/xinetd-fix-fd-leak.patch\
%D%/packages/patches/xinetd-CVE-2013-4342.patch \
%D%/packages/patches/xmodmap-asprintf.patch \
- %D%/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch \
%D%/packages/patches/zathura-plugindir-environment-variable.patch
MISC_DISTRO_FILES =\
diff --git
a/gnu/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch
b/gnu/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch
deleted file mode 100644
index 63e058b..000
--- a/gnu/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Tobias Geerinckx-Rice
-Date: Mon, 18 Jun 2018 02:37:41 +0200
-Subject: zathura-pdf-mupdf: Link to JPEG libraries.
-
-As of version 0.3.3, zathura-pdf-mupdf no longer links to some required
-JPEG libraries, leading to such errors as:
-
- $ zathura foo.pdf
- error: Could not load plugin
'/gnu/store/...-profile/lib/zathura/libpdf-mupdf.so'
(/gnu/store/...-profile/lib/zathura/libpdf-mupdf.so: undefined symbol:
jpeg_resync_to_restart).
-
-The patch below, copied verbatim from Arch[0], fixes that.
-Its description happens to match our reality, too.
-
-[0]:
https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/zathura-pdf-mupdf
-From 3fb0ff750373d45d4f5172ce1d41b74183cd07e8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Johannes=20L=C3=B6thberg?=
-Date: Sat, 24 Mar 2018 14:31:18 +0100
-Subject: [PATCH] Explicitly link against jbig2dec, openjp2, and jpeg
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Normally these are statically linked into libmupdfthird, but we delete
-those to make mupdf use the system libraries. Previously
-zathura-pdf-mupdf explicitly linked against them, but this is
-technically incorrect since they are supposed to be in libmupdfthird so
-that was removed. This commit essentially reverts that in the new build
-system.
-
-Signed-off-by: Johannes Löthberg
- meson.build | 6 +-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 3b0d7b7..ae2fc9c 100644
a/meson.build
-+++ b/meson.build
-@@ -22,7 +22,11 @@ cairo = dependency('cairo')
- mupdf = cc.find_library('mupdf')
- mupdfthird = cc.find_library('mupdfthird')
-
--build_dependencies = [zathura, girara, glib, cairo, mupdf, mupdfthird]
-+jbig2dec = cc.find_library('jbig2dec')
-+openjp2 = cc.find_library('openjp2')
-+jpeg = cc.find_library('jpeg')
-+
-+build_dependencies = [zathura, girara, glib, cairo, mupdf, mupdfthird,
jbig2dec, openjp2, jpeg]
-
- # defines
- defines = [
---
-2.16.3
-
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 061a65a..4c3e983 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -415,17 +415,15 @@ using the DjVuLibre library.")
(define-public zathura-pdf-mupdf
(package
(name "zathura-pdf-mupdf")
-(version "0.3.3")
+(version "0.3.4")
(source (origin
(method url-fetch)
(uri
(string-append "https://pwmt.org/projects/zathura-pdf-mupdf;
"/download/zathura-pdf-mupdf-" version
".tar.xz"))
- (patches
- (search-patches
"zathura-pdf-mupdf-link-to-jpeg-libraries.patch"))
(sha256
(base32
-"1zbdqimav4wfgimpy3nfzl10qj7vyv23rdy2z5z7z93jwbp2rc2j"
+"166d5nz47ixzwj4pixsd5fd9qvjf5v34cdqi3p72vr23pswk2hyn"
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs
`(("jbig2dec" ,jbig2dec)
branch master updated (2b9b4b1 -> 852a569)
efraim pushed a change to branch master in repository guix. from 2b9b4b1 gnu: hashcat-utils: Update to 1.9. new 7930cfc gnu: qt: Update to 5.11.2. new d28af19 gnu: qt: Use system sqlite. new 124351e gnu: qt: Add vulkan support. new 3ea61f9 gnu: qt: Use invoke. new 1f71daf gnu: qt@4: Update build config. new 852a569 gnu: qt@4: Use invoke. The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/databases.scm | 12 ++ gnu/packages/qt.scm| 343 +++-- 2 files changed, 190 insertions(+), 165 deletions(-)
01/06: gnu: qt: Update to 5.11.2.
efraim pushed a commit to branch master
in repository guix.
commit 7930cfc98923eda64ec4a37d56b19f96f86f5f59
Author: Efraim Flashner
Date: Sun Oct 21 09:03:02 2018 +0300
gnu: qt: Update to 5.11.2.
* gnu/packages/qt.scm (qt, qtbase, qtsvg, qtimageformats, qtx11extras,
qtxmlpatterns, qtdeclarative, qtconnectivity, qtwebsockets, qtsensors,
qtmultimedia, qtwayland, qtserialport, qtserialbus, qtwebchannel,
qtwebglplugin, qtwebview, qtlocation, qttools, qtscript,
qtquickcontrols, qtquickcontrols2, qtgraphicaleffects, qtgamepad,
qtscxml, qtpurchasing, qtcanvas3d, qtcharts, qtdatavis3d, qtnetworkauth,
qtremoteobjects, qtspeech): Update to 5.11.2.
---
gnu/packages/qt.scm | 128 ++--
1 file changed, 64 insertions(+), 64 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5195c71..05713e8 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -105,7 +105,7 @@ system, and the core design of Django is reused in
Grantlee.")
(define-public qt
(package
(name "qt")
-(version "5.11.1")
+(version "5.11.2")
(outputs '("out" "examples"))
(source (origin
(method url-fetch)
@@ -118,7 +118,7 @@ system, and the core design of Django is reused in
Grantlee.")
version ".tar.xz"))
(sha256
(base32
- "0azva1wx298jh0xskymz8jic83yhxs1xfxf321wqd5lwiyq2qq1r"))
+ "10faac59jvz6dxxljdkaknlxazpnaxgvqdcszabfbbkc1f24n466"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -483,7 +483,7 @@ system, and the core design of Django is reused in
Grantlee.")
(define-public qtbase
(package
(name "qtbase")
-(version "5.11.1")
+(version "5.11.2")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/;
@@ -492,7 +492,7 @@ system, and the core design of Django is reused in
Grantlee.")
version ".tar.xz"))
(sha256
(base32
- "0ipv18ypbgpxhh49rfplqmflskmnhhwj1bjr5hrwi0jpvar4gl50"))
+ "01q1rn5rp9biq3z38953z2hgm4nirvp2jfv8wg7isnld8v1yg0b3"))
;; Use TZDIR to avoid depending on package "tzdata".
(patches (search-patches "qtbase-use-TZDIR.patch"))
(modules '((guix build utils)))
@@ -726,7 +726,7 @@ developers using C++ or QML, a CSS & JavaScript like
language.")
(define-public qtsvg
(package (inherit qtbase)
(name "qtsvg")
-(version "5.11.1")
+(version "5.11.2")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/;
@@ -735,7 +735,7 @@ developers using C++ or QML, a CSS & JavaScript like
language.")
version ".tar.xz"))
(sha256
(base32
- "0drhig0jcss3cf01aqfmafajf8gzf6bh468g1ikyrkh46czgyshx"
+ "0rni3cdcli91v7k8ra9s9phpznvkza8qqvcrv9yyfrmlapwbn5mw"
(propagated-inputs `())
(native-inputs `(("perl" ,perl)))
(inputs
@@ -801,7 +801,7 @@ HostData=lib/qt5
(define-public qtimageformats
(package (inherit qtsvg)
(name "qtimageformats")
-(version "5.11.1")
+(version "5.11.2")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/;
@@ -810,7 +810,7 @@ HostData=lib/qt5
version ".tar.xz"))
(sha256
(base32
- "05jnyrq7klr3mdiz0r9c151vl829yc8y9cxfbw5dwbp1rkndwl7b"))
+ "0s1s33k0wrnf9fi1wlm1kaq9hs1fx89597nhk53vzdfha42x3r97"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -832,7 +832,7 @@ support for MNG, TGA, TIFF and WBMP image formats.")))
(define-public qtx11extras
(package (inherit qtsvg)
(name "qtx11extras")
-(version "5.11.1")
+(version "5.11.2")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/;
@@ -841,7 +841,7 @@ support for MNG, TGA, TIFF and WBMP image formats.")))
version ".tar.xz"))
(sha256
(base32
- "0rccpmhz48kq4xs441lj9mnwpbi6kxwl8y7dj7w7g5zvpv41kwmw"
+ "12cha7pd3cjx7zr0l7rbi1j2pfwmfpdwc7w3dsqbyi1d0mhwl1zl"
03/06: gnu: qt: Add vulkan support.
efraim pushed a commit to branch master
in repository guix.
commit 124351efadf9c0ad5a4dd2d48ca604ed19092ffc
Author: Efraim Flashner
Date: Sun Oct 21 09:05:13 2018 +0300
gnu: qt: Add vulkan support.
* gnu/packages/qt.scm (qt, qtbase)[native-inputs]: Add vulkan-headers.
(qt@4)[native-inputs]: Don't add vulkan-headers.
(qttools)[native-inputs]: Add vulkan-headers.
---
gnu/packages/qt.scm | 23 +--
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index dffa8b5..ae926ed 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -64,9 +64,11 @@
#:use-module (gnu packages ruby)
#:use-module (gnu packages sdl)
#:use-module (gnu packages tls)
+ #:use-module (gnu packages vulkan)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
- #:use-module (gnu packages xml))
+ #:use-module (gnu packages xml)
+ #:use-module (srfi srfi-1))
(define-public grantlee
(package
@@ -224,6 +226,7 @@ system, and the core design of Django is reused in
Grantlee.")
("pkg-config" ,pkg-config)
("python" ,python-2)
("ruby" ,ruby)
+ ("vulkan-headers" ,vulkan-headers)
("which" ,(@ (gnu packages base) which
(arguments
`(#:parallel-build? #f ; Triggers race condition in qtbase module on
Hydra.
@@ -401,10 +404,16 @@ system, and the core design of Django is reused in
Grantlee.")
;; Remove webkit module, which is not built.
'(begin (delete-file-recursively "src/3rdparty/webkit")
#t
-(inputs `(,@(alist-delete "harfbuzz"
- (alist-delete "libjpeg" (package-inputs qt)))
- ("libjepg" ,libjpeg-8)
- ("libsm" ,libsm)))
+(inputs
+ `(,@(fold alist-delete
+ (package-inputs qt)
+ '("harfbuzz" "libjpeg"))
+ ("libjpeg" ,libjpeg-8)
+ ("libsm" ,libsm)))
+(native-inputs
+ `(,@(fold alist-delete
+ (package-native-inputs qt)
+ '("vulkan-headers"
;; Note: there are 37 MiB of examples and a '-exampledir' configure flags,
;; but we can't make them a separate output because "out" and "examples"
@@ -560,6 +569,7 @@ system, and the core design of Django is reused in
Grantlee.")
("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python-2)
+ ("vulkan-headers" ,vulkan-headers)
("ruby" ,ruby)))
(arguments
`(#:phases
@@ -1283,7 +1293,8 @@ positioning and geolocation plugins.")))
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(native-inputs
`(("perl" ,perl)
- ("qtdeclarative" ,qtdeclarative)))
+ ("qtdeclarative" ,qtdeclarative)
+ ("vulkan-headers" ,vulkan-headers)))
(inputs
`(("mesa" ,mesa)
("qtbase" ,qtbase)))
02/06: gnu: qt: Use system sqlite.
efraim pushed a commit to branch master
in repository guix.
commit d28af1991ae0a99e660ad1b82ac96d3a9382
Author: Efraim Flashner
Date: Sun Oct 21 09:04:41 2018 +0300
gnu: qt: Use system sqlite.
* gnu/packages/databases.scm (sqlite-with-column-metadata): New
variable.
* gnu/packages/qt.scm (qt, qtbase)[source]: Remove bundled sqlite.
[inputs]: Add sqlite-with-column-metadata.
[arguments]: Add configure-flag to use system sqlite.
---
gnu/packages/databases.scm | 12
gnu/packages/qt.scm| 15 ++-
2 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 6ebbc28..87fb170 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1211,6 +1211,18 @@ is in the public domain.")
((#:configure-flags flags)
`(cons "--enable-fts5" ,flags))
+;; This is used by Qt.
+(define-public sqlite-with-column-metadata
+ (package (inherit sqlite)
+(name "sqlite-with-column-metadata")
+(arguments
+ (substitute-keyword-arguments (package-arguments sqlite)
+ ((#:configure-flags flags)
+`(list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE "
+ "-DSQLITE_ENABLE_UNLOCK_NOTIFY "
+ "-DSQLITE_ENABLE_DBSTAT_VTAB "
+ "-DSQLITE_ENABLE_COLUMN_METADATA")))
+
(define-public tdb
(package
(name "tdb")
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 05713e8..dffa8b5 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -135,7 +135,7 @@ system, and the core design of Django is reused in
Grantlee.")
(lambda (dir)
(delete-file-recursively (string-append
"qtbase/src/3rdparty/" dir)))
(list "double-conversion" "freetype" "harfbuzz-ng"
-"libpng" "libjpeg" "pcre2" "xcb"
+"libpng" "libjpeg" "pcre2" "sqlite" "xcb"
"xkbcommon" "zlib"))
(for-each
(lambda (dir)
@@ -206,7 +206,7 @@ system, and the core design of Django is reused in
Grantlee.")
("postgresql" ,postgresql)
("pulseaudio" ,pulseaudio)
("pcre2" ,pcre2)
- ;("sqlite" ,sqlite)
+ ("sqlite" ,sqlite-with-column-metadata)
("udev" ,eudev)
("unixodbc" ,unixodbc)
("wayland" ,wayland)
@@ -273,7 +273,7 @@ system, and the core design of Django is reused in
Grantlee.")
"-no-compile-examples"
;; Most "-system-..." are automatic, but some use
;; the bundled copy by default.
- ;"-system-sqlite"
+ "-system-sqlite"
"-system-harfbuzz"
"-system-pcre"
;; explicitly link with openssl instead of dlopening it
@@ -503,7 +503,7 @@ system, and the core design of Django is reused in
Grantlee.")
(lambda (dir)
(delete-file-recursively (string-append "src/3rdparty/"
dir)))
(list "double-conversion" "freetype" "harfbuzz-ng"
-"libpng" "libjpeg" "pcre2" "xcb"
+"libpng" "libjpeg" "pcre2" "sqlite" "xcb"
"xkbcommon" "zlib"))
#t
(build-system gnu-build-system)
@@ -545,7 +545,7 @@ system, and the core design of Django is reused in
Grantlee.")
("pcre2" ,pcre2)
("postgresql" ,postgresql)
("pulseaudio" ,pulseaudio)
- ;("sqlite" ,sqlite)
+ ("sqlite" ,sqlite-with-column-metadata)
("unixodbc" ,unixodbc)
("xcb-util" ,xcb-util)
("xcb-util-image" ,xcb-util-image)
@@ -616,10 +616,7 @@ system, and the core design of Django is reused in
Grantlee.")
"-no-compile-examples"
;; Most "-system-..." are automatic, but some use
;; the bundled copy by default.
- ;; System sqlite fails on 5.10+
- ;;.obj/qsql_sqlite.o: In function
`QSQLiteResultPrivate::initColumns(bool)':
- ;;qsql_sqlite.cpp:(.text+0x190c): undefined reference to
`sqlite3_column_table_name16'
- ;"-system-sqlite"
+ "-system-sqlite"
"-system-harfbuzz"
"-system-pcre"
;; explicitly link with openssl instead of dlopening it
04/06: gnu: qt: Use invoke.
efraim pushed a commit to branch master
in repository guix.
commit 3ea61f9642e0552bde145b823292445b4172e6bd
Author: Efraim Flashner
Date: Sun Oct 21 10:07:17 2018 +0300
gnu: qt: Use invoke.
* gnu/packages/qt.scm (qt)[arguments]: Use invoke.
---
gnu/packages/qt.scm | 90 ++---
1 file changed, 45 insertions(+), 45 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index ae926ed..b6105fa 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -249,51 +249,51 @@ system, and the core design of Django is reused in
Grantlee.")
(("/bin/ls") (which "ls")))
;; do not pass "--enable-fast-install", which makes the
;; configure process fail
- (zero? (system*
- "./configure"
- "-verbose"
- "-prefix" out
- "-docdir" (string-append out "/share/doc/qt5")
- "-headerdir" (string-append out "/include/qt5")
- "-archdatadir" (string-append out "/lib/qt5")
- "-datadir" (string-append out "/share/qt5")
- "-examplesdir" (string-append
-examples "/share/doc/qt5/examples") ;
151MiB
- "-opensource"
- "-confirm-license"
-
- ;; These features require higher versions of Linux than
the
- ;; minimum version of the glibc. See
- ;; src/corelib/global/minimum-linux_p.h. By disabling
these
- ;; features Qt5 applications can be used on the oldest
- ;; kernels that the glibc supports, including the RHEL6
- ;; (2.6.32) and RHEL7 (3.10) kernels.
- "-no-feature-getentropy" ; requires Linux 3.17
- "-no-feature-renameat2" ; requires Linux 3.16
-
- ;; Do not build examples; for the time being, we
- ;; prefer to save the space and build time.
- "-no-compile-examples"
- ;; Most "-system-..." are automatic, but some use
- ;; the bundled copy by default.
- "-system-sqlite"
- "-system-harfbuzz"
- "-system-pcre"
- ;; explicitly link with openssl instead of dlopening it
- "-openssl-linked"
- ;; explicitly link with dbus instead of dlopening it
- "-dbus-linked"
- ;; don't use the precompiled headers
- "-no-pch"
- ;; drop special machine instructions not supported
- ;; on all instances of the target
- ,@(if (string-prefix? "x86_64"
- (or (%current-target-system)
- (%current-system)))
- '()
- '("-no-sse2"))
- "-no-mips_dsp"
- "-no-mips_dspr2")
+ (invoke
+ "./configure"
+ "-verbose"
+ "-prefix" out
+ "-docdir" (string-append out "/share/doc/qt5")
+ "-headerdir" (string-append out "/include/qt5")
+ "-archdatadir" (string-append out "/lib/qt5")
+ "-datadir" (string-append out "/share/qt5")
+ "-examplesdir" (string-append
+ examples "/share/doc/qt5/examples") ; 151MiB
+ "-opensource"
+ "-confirm-license"
+
+ ;; These features require higher versions of Linux than the
+ ;; minimum version of the glibc. See
+ ;; src/corelib/global/minimum-linux_p.h. By disabling these
+ ;; features Qt5 applications can be used on the oldest
+ ;; kernels that the glibc supports, including the RHEL6
+ ;; (2.6.32) and RHEL7 (3.10) kernels.
+ "-no-feature-getentropy" ; requires Linux 3.17
+ "-no-feature-renameat2" ; requires Linux 3.16
+
+ ;; Do not build examples; for the time being, we
+
05/06: gnu: qt@4: Update build config.
efraim pushed a commit to branch master
in repository guix.
commit 1f71daf499c1c0708f56cd4623d07082a355fff3
Author: Efraim Flashner
Date: Sun Oct 21 10:04:34 2018 +0300
gnu: qt@4: Update build config.
* gnu/packages/qt.scm (qt@4)[arguments]: Substitute hardcoded '/bin/ls'
invocation. Add configure-flags to not build the examples or demos.
Don't use the precompiled headers.
---
gnu/packages/qt.scm | 5 +
1 file changed, 5 insertions(+)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index b6105fa..b28e358 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -430,11 +430,14 @@ system, and the core design of Django is reused in
Grantlee.")
(doc (assoc-ref outputs "doc")))
(substitute* '("configure")
(("/bin/pwd") (which "pwd")))
+ (substitute* "src/corelib/global/global.pri"
+(("/bin/ls") (which "ls")))
(zero? (system*
"./configure"
"-verbose"
"-prefix" out
+ "-nomake" "examples demos"
;; Note: Don't pass '-docdir' since 'qmake' and
;; libQtCore would record its value, thereby defeating
;; the whole point of having a separate output.
@@ -457,6 +460,8 @@ system, and the core design of Django is reused in
Grantlee.")
;; Skip the webkit module; it fails to build on armhf
;; and, apart from that, may pose security risks.
"-no-webkit"
+ ;; don't use the precompiled headers
+ "-no-pch"
;; drop special machine instructions not supported
;; on all instances of the target
,@(if (string-prefix? "x86_64"
06/06: gnu: qt@4: Use invoke.
efraim pushed a commit to branch master
in repository guix.
commit 852a5692bbed1f2d23c0e47a7cdfb2a604a8f8b3
Author: Efraim Flashner
Date: Sun Oct 21 10:07:35 2018 +0300
gnu: qt@4: Use invoke.
* gnu/packages/qt.scm (qt@4)[arguments]: Use invoke.
---
gnu/packages/qt.scm | 88 ++---
1 file changed, 44 insertions(+), 44 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index b28e358..d487699 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -433,50 +433,50 @@ system, and the core design of Django is reused in
Grantlee.")
(substitute* "src/corelib/global/global.pri"
(("/bin/ls") (which "ls")))
- (zero? (system*
- "./configure"
- "-verbose"
- "-prefix" out
- "-nomake" "examples demos"
- ;; Note: Don't pass '-docdir' since 'qmake' and
- ;; libQtCore would record its value, thereby defeating
- ;; the whole point of having a separate output.
- "-datadir" (string-append out "/share/qt-" ,version
-"/data")
- "-importdir" (string-append out "/lib/qt-4"
- "/imports")
- "-plugindir" (string-append out "/lib/qt-4"
- "/plugins")
- "-translationdir" (string-append out "/share/qt-"
,version
- "/translations")
- "-demosdir"(string-append out "/share/qt-" ,version
-"/demos")
- "-examplesdir" (string-append out "/share/qt-" ,version
-"/examples")
- "-opensource"
- "-confirm-license"
- ;; explicitly link with dbus instead of dlopening it
- "-dbus-linked"
- ;; Skip the webkit module; it fails to build on armhf
- ;; and, apart from that, may pose security risks.
- "-no-webkit"
- ;; don't use the precompiled headers
- "-no-pch"
- ;; drop special machine instructions not supported
- ;; on all instances of the target
- ,@(if (string-prefix? "x86_64"
-(or (%current-target-system)
-(%current-system)))
-'()
-'("-no-mmx"
- "-no-3dnow"
- "-no-sse"
- "-no-sse2"))
- "-no-sse3"
- "-no-ssse3"
- "-no-sse4.1"
- "-no-sse4.2"
- "-no-avx")
+ (invoke
+"./configure"
+"-verbose"
+"-prefix" out
+"-nomake" "examples demos"
+;; Note: Don't pass '-docdir' since 'qmake' and
+;; libQtCore would record its value, thereby defeating
+;; the whole point of having a separate output.
+"-datadir" (string-append out "/share/qt-" ,version
+ "/data")
+"-importdir" (string-append out "/lib/qt-4"
+"/imports")
+"-plugindir" (string-append out "/lib/qt-4"
+"/plugins")
+"-translationdir" (string-append out "/share/qt-" ,version
+ "/translations")
+"-demosdir"(string-append out "/share/qt-" ,version
+ "/demos")
+"-examplesdir" (string-append out "/share/qt-" ,version
+ "/examples")
+"-opensource"
+"-co
01/01: gnu: mailutils: Update to 3.5.
efraim pushed a commit to branch master
in repository guix.
commit 20a3df0fd3353fe00a3cfde36317e0c8f4fc1187
Author: Efraim Flashner
Date: Sat Oct 27 23:53:57 2018 +0300
gnu: mailutils: Update to 3.5.
* gnu/packages/mail.scm (mailutils): Update to 3.5.
[source]: Remove patch, remove snippet.
[native-inputs]: Remove flex, bison.
[inputs]: Remove guile-2.0, add guile-2.2.
* gnu/packages/patches/mailutils-uninitialized-memory.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
gnu/local.mk | 1 -
gnu/packages/mail.scm | 24 ++
.../patches/mailutils-uninitialized-memory.patch | 87 --
3 files changed, 5 insertions(+), 107 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index ba86d55..56c434d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -938,7 +938,6 @@ dist_patch_DATA =
\
%D%/packages/patches/lvm2-static-link.patch \
%D%/packages/patches/lxsession-use-gapplication.patch \
%D%/packages/patches/lyx-2.2.3-fix-test.patch\
- %D%/packages/patches/mailutils-uninitialized-memory.patch\
%D%/packages/patches/make-glibc-compat.patch \
%D%/packages/patches/make-impure-dirs.patch \
%D%/packages/patches/mariadb-gcc-ice.patch \
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index e7e440b..7d6ea74 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -126,24 +126,14 @@
(define-public mailutils
(package
(name "mailutils")
-(version "3.4")
+(version "3.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/mailutils/mailutils-"
- version ".tar.bz2"))
+ version ".tar.xz"))
(sha256
(base32
- "1dn71p85wlyisnwsb485sk3q5v393k3dizsa9fmimskdwjwgk3ch"))
- (patches
- (search-patches "mailutils-uninitialized-memory.patch"))
- (snippet
- ;; For a rebuild of the Flex/Bison byproducts touched by the
- ;; patch above.
- '(begin
- (for-each delete-file
- '("mh/mh_alias_lex.c"
- "libmailutils/cfg/parser.c"))
- #t
+ "1wx275w38fwni2abc8g7g3irbk332vr34byxd72zqfdiznsqgims"
(build-system gnu-build-system)
(arguments
'(#:phases
@@ -197,16 +187,12 @@
#:configure-flags '("--sysconfdir=/etc")
#:parallel-tests? #f))
(native-inputs
- ;; Note: Bison and Flex needed due to
- ;; 'mailutils-uninitialized-memory.patch'.
- `(("bison" ,bison)
- ("flex" ,flex)
- ("perl" ,perl))) ;for 'gylwrap'
+ `(("perl" ,perl))) ;for 'gylwrap'
(inputs
`(("dejagnu" ,dejagnu)
("m4" ,m4)
("texinfo" ,texinfo)
- ("guile" ,guile-2.0)
+ ("guile" ,guile-2.2)
("gnutls" ,gnutls)
("ncurses" ,ncurses)
("readline" ,readline)
diff --git a/gnu/packages/patches/mailutils-uninitialized-memory.patch
b/gnu/packages/patches/mailutils-uninitialized-memory.patch
deleted file mode 100644
index ef4daf9..000
--- a/gnu/packages/patches/mailutils-uninitialized-memory.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Without this patch, the MH test suite would fail when building with
-glibc 2.26, with 'ali' segfaulting like this:
-
- Core was generated by
`/tmp/guix-build-mailutils-3.4.drv-0/mailutils-3.4/mh/.libs/ali -a
./Mail/mh_ali'.
- Program terminated with signal SIGSEGV, Segmentation fault.
- #0 0x7f8eac263a14 in hash (
- name=0x72642e342e332d73 , hash_num=0) at assoc.c:102
- 102for (i = 0; *name; name++)
- (gdb) bt
- #0 0x7f8eac263a14 in hash (
- name=0x72642e342e332d73 , hash_num=0) at assoc.c:102
- #1 0x7f8eac263e6b in assoc_find_slot (assoc=0xaa59e0,
- name=0x72642e342e332d73 , install=0x0, slot=0x7ffcddcbf2b8) at assoc.c:219
- #2 0x7f8eac264124 in mu_assoc_lookup (assoc=0xaa59e0,
- name=0x72642e342e332d73 , dataptr=0x7ffcddcbf2e0) at assoc.c:308
- #3 0x7f8eac29e8ac in mu_ident_deref (
- name=0x72642e342e332d73 ) at ident.c:98
- #4 0x7f8eac29f8a6 in mu_locus_point_deinit (pt=0xaa5718) at locus.c:48
- #5 0x7f8eac29fa1b in mu_locus_range_deinit (lr=0xaa5718) at locus.c:99
- #6 0x7f8eac29f9db in mu_locus_range_copy (dest=0xaa5718,
- src=0x622be0 ) at locus.c:89
- #7 0x00408a2a in push_source (nam
branch master updated (763d449 -> 20a3df0)
efraim pushed a change to branch master in repository guix. from 763d449 gnu: guile-sdl2: Update to 0.3.1. new 20a3df0 gnu: mailutils: Update to 3.5. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/local.mk | 1 - gnu/packages/mail.scm | 24 ++ .../patches/mailutils-uninitialized-memory.patch | 87 -- 3 files changed, 5 insertions(+), 107 deletions(-) delete mode 100644 gnu/packages/patches/mailutils-uninitialized-memory.patch
01/07: gnu: qt: Update to 5.11.2.
efraim pushed a commit to branch qt-updates
in repository guix.
commit 1bc9c98e33726e1130e951e6950921e4f36d641e
Author: Efraim Flashner
Date: Sun Oct 21 09:03:02 2018 +0300
gnu: qt: Update to 5.11.2.
* gnu/packages/qt.scm (qt, qtbase, qtsvg, qtimageformats, qtx11extras,
qtxmlpatterns, qtdeclarative, qtconnectivity, qtwebsockets, qtsensors,
qtmultimedia, qtwayland, qtserialport, qtserialbus, qtwebchannel,
qtwebglplugin, qtwebview, qtlocation, qttools, qtscript,
qtquickcontrols, qtquickcontrols2, qtgraphicaleffects, qtgamepad,
qtscxml, qtpurchasing, qtcanvas3d, qtcharts, qtdatavis3d, qtnetworkauth,
qtremoteobjects, qtspeech): Update to 5.11.2.
---
gnu/packages/qt.scm | 128 ++--
1 file changed, 64 insertions(+), 64 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5195c71..05713e8 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -105,7 +105,7 @@ system, and the core design of Django is reused in
Grantlee.")
(define-public qt
(package
(name "qt")
-(version "5.11.1")
+(version "5.11.2")
(outputs '("out" "examples"))
(source (origin
(method url-fetch)
@@ -118,7 +118,7 @@ system, and the core design of Django is reused in
Grantlee.")
version ".tar.xz"))
(sha256
(base32
- "0azva1wx298jh0xskymz8jic83yhxs1xfxf321wqd5lwiyq2qq1r"))
+ "10faac59jvz6dxxljdkaknlxazpnaxgvqdcszabfbbkc1f24n466"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -483,7 +483,7 @@ system, and the core design of Django is reused in
Grantlee.")
(define-public qtbase
(package
(name "qtbase")
-(version "5.11.1")
+(version "5.11.2")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/;
@@ -492,7 +492,7 @@ system, and the core design of Django is reused in
Grantlee.")
version ".tar.xz"))
(sha256
(base32
- "0ipv18ypbgpxhh49rfplqmflskmnhhwj1bjr5hrwi0jpvar4gl50"))
+ "01q1rn5rp9biq3z38953z2hgm4nirvp2jfv8wg7isnld8v1yg0b3"))
;; Use TZDIR to avoid depending on package "tzdata".
(patches (search-patches "qtbase-use-TZDIR.patch"))
(modules '((guix build utils)))
@@ -726,7 +726,7 @@ developers using C++ or QML, a CSS & JavaScript like
language.")
(define-public qtsvg
(package (inherit qtbase)
(name "qtsvg")
-(version "5.11.1")
+(version "5.11.2")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/;
@@ -735,7 +735,7 @@ developers using C++ or QML, a CSS & JavaScript like
language.")
version ".tar.xz"))
(sha256
(base32
- "0drhig0jcss3cf01aqfmafajf8gzf6bh468g1ikyrkh46czgyshx"
+ "0rni3cdcli91v7k8ra9s9phpznvkza8qqvcrv9yyfrmlapwbn5mw"
(propagated-inputs `())
(native-inputs `(("perl" ,perl)))
(inputs
@@ -801,7 +801,7 @@ HostData=lib/qt5
(define-public qtimageformats
(package (inherit qtsvg)
(name "qtimageformats")
-(version "5.11.1")
+(version "5.11.2")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/;
@@ -810,7 +810,7 @@ HostData=lib/qt5
version ".tar.xz"))
(sha256
(base32
- "05jnyrq7klr3mdiz0r9c151vl829yc8y9cxfbw5dwbp1rkndwl7b"))
+ "0s1s33k0wrnf9fi1wlm1kaq9hs1fx89597nhk53vzdfha42x3r97"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -832,7 +832,7 @@ support for MNG, TGA, TIFF and WBMP image formats.")))
(define-public qtx11extras
(package (inherit qtsvg)
(name "qtx11extras")
-(version "5.11.1")
+(version "5.11.2")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/;
@@ -841,7 +841,7 @@ support for MNG, TGA, TIFF and WBMP image formats.")))
version ".tar.xz"))
(sha256
(base32
- "0rccpmhz48kq4xs441lj9mnwpbi6kxwl8y7dj7w7g5zvpv41kwmw"
+ "12cha7pd3cjx7zr0l7rbi1j2pfwmfpdwc7w3dsqbyi1d0mhwl1zl"
03/07: gnu: qt: Add vulkan support.
efraim pushed a commit to branch qt-updates
in repository guix.
commit 540ac5725873fadccc912668071e1b2f070eafdd
Author: Efraim Flashner
Date: Sun Oct 21 09:05:13 2018 +0300
gnu: qt: Add vulkan support.
* gnu/packages/qt.scm (qt, qtbase)[native-inputs]: Add vulkan-headers.
(qt@4)[native-inputs]: Don't add vulkan-headers.
(qttools)[native-inputs]: Add vulkan-headers.
---
gnu/packages/qt.scm | 23 +--
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index dffa8b5..143ca45 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -64,9 +64,11 @@
#:use-module (gnu packages ruby)
#:use-module (gnu packages sdl)
#:use-module (gnu packages tls)
+ #:use-module (gnu packages vulkan)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
- #:use-module (gnu packages xml))
+ #:use-module (gnu packages xml)
+ #:use-module (srfi srfi-1))
(define-public grantlee
(package
@@ -224,6 +226,7 @@ system, and the core design of Django is reused in
Grantlee.")
("pkg-config" ,pkg-config)
("python" ,python-2)
("ruby" ,ruby)
+ ("vulkan-headers" ,vulkan-headers)
("which" ,(@ (gnu packages base) which
(arguments
`(#:parallel-build? #f ; Triggers race condition in qtbase module on
Hydra.
@@ -401,10 +404,16 @@ system, and the core design of Django is reused in
Grantlee.")
;; Remove webkit module, which is not built.
'(begin (delete-file-recursively "src/3rdparty/webkit")
#t
-(inputs `(,@(alist-delete "harfbuzz"
- (alist-delete "libjpeg" (package-inputs qt)))
- ("libjepg" ,libjpeg-8)
- ("libsm" ,libsm)))
+(inputs
+ `(,@(fold alist-delete
+ (package-inputs qt)
+ '("harfbuzz" "libjepg"))
+ ("libjepg" ,libjpeg-8)
+ ("libsm" ,libsm)))
+(native-inputs
+ `(,@(fold alist-delete
+ (package-native-inputs qt)
+ '("vulkan-headers"
;; Note: there are 37 MiB of examples and a '-exampledir' configure flags,
;; but we can't make them a separate output because "out" and "examples"
@@ -560,6 +569,7 @@ system, and the core design of Django is reused in
Grantlee.")
("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python-2)
+ ("vulkan-headers" ,vulkan-headers)
("ruby" ,ruby)))
(arguments
`(#:phases
@@ -1283,7 +1293,8 @@ positioning and geolocation plugins.")))
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(native-inputs
`(("perl" ,perl)
- ("qtdeclarative" ,qtdeclarative)))
+ ("qtdeclarative" ,qtdeclarative)
+ ("vulkan-headers" ,vulkan-headers)))
(inputs
`(("mesa" ,mesa)
("qtbase" ,qtbase)))
05/07: gnu: qt@4: Update license list.
efraim pushed a commit to branch qt-updates in repository guix. commit bd7dd7649d64411e7ed12cd98897ffd0873f9b3d Author: Efraim Flashner Date: Sun Oct 21 09:21:34 2018 +0300 gnu: qt@4: Update license list. * gnu/packages/qt.scm (qt@4)[license]: Fix license information. --- gnu/packages/qt.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 65ba4af..6d9b3f9 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -487,7 +487,8 @@ system, and the core design of Django is reused in Grantlee.") ;; different "devices" due to bind-mounts. (copy-recursively olddoc docdir) (delete-file-recursively olddoc) - #t + #t)) + (license (list license:lgpl2.1 license:gpl3 (define-public qtbase (package
