From 8ba0bd1c6c6d7476f5252da95cdc906b63935418 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 28 Mar 2017 05:36:20 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.57. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.57. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c42a679ba..a9fbf918c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -354,8 +354,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.56" - "16fa4rf6vdyakvjis2ahvzdw87znsqgxd84458y86z2szwbaym7n" + (make-linux-libre "4.4.57" + "18mgf2xvjfqkg62kmffhbpgxgqpizy400b9ndagq3rlx7pcx5v1j" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.3 From cd5ba39588a2208696078c1f28462cef512a0f0e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 28 Mar 2017 05:37:08 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.18. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.18. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a9fbf918c..3d31fe440 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -348,8 +348,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.17" - "1543b159s6v5z9l2bskw9rd6v8d98da8sppd34lz7nin6nk00cpk" + (make-linux-libre "4.9.18" + "1f8a4z0hjl4j899pzlyblp7wbn6n5r5lxkw0hwy6ml0dm0dkscrj" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.3 From 9909b8b952d849e22fc93e4ebf7f74614f3489a0 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 28 Mar 2017 05:37:42 -0400 Subject: gnu: linux-libre: Update to 4.10.6. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.10.6. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3d31fe440..9a466e0ad 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -338,8 +338,8 @@ It has been modified to remove all non-free binary blobs.") (define %intel-compatible-systems '("x86_64-linux" "i686-linux")) -(define %linux-libre-version "4.10.5") -(define %linux-libre-hash "0qxanna5a82vyh5yb3mv8vvx5i9kdzmq2p6q7xp1fy88x9gj11xb") +(define %linux-libre-version "4.10.6") +(define %linux-libre-hash "01iv39dpqvnmynrvjk3ji5411ywazx96pkjkw4v1bm7jqvc1b7bh") (define-public linux-libre (make-linux-libre %linux-libre-version -- cgit v1.3 From f125ec8ef2ae3648047f85ab9f8b554b5a13bbbc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 28 Mar 2017 00:08:36 +0200 Subject: gnu: fio: Install python scripts in separate output. * gnu/packages/benchmark.scm (fio)[outputs]: New field. [arguments]: Rename 'wrap-python-scripts' phase to 'move-outputs'. Keep wrapper. --- gnu/packages/benchmark.scm | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index ff5715d57..9f6381eb4 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -64,13 +64,26 @@ (let ((out (assoc-ref outputs "out"))) (zero? (system* "./configure" (string-append "--prefix=" out)))))) - (add-after - 'install 'wrap-python-scripts - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/fiologparser_hist.py") - `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))) - #t)))))) + ;; The main `fio` executable is fairly small and self contained. + ;; Moving the auxiliary python and gnuplot scripts to a separate + ;; output saves almost 400 MiB on the closure. + (add-after 'install 'move-outputs + (lambda* (#:key outputs #:allow-other-keys) + (let ((oldbin (string-append (assoc-ref outputs "out") "/bin")) + (newbin (string-append (assoc-ref outputs "utils") "/bin"))) + (mkdir-p newbin) + (for-each (lambda (file) + (let ((src (string-append oldbin "/" file)) + (dst (string-append newbin "/" file))) + (link src dst) + (delete-file src))) + '("fio2gnuplot" "fio_latency2csv.py" + "fiologparser_hist.py" "fiologparser.py")) + ;; Make sure numpy et.al is found. + (wrap-program (string-append newbin "/fiologparser_hist.py") + `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))) + #t)))))) + (outputs '("out" "utils")) (inputs `(("libaio" ,libaio) ("gnuplot" ,gnuplot) -- cgit v1.3 From ad31b4febf4ef70df614dc7fa4ac196314501f3f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 4 Mar 2017 01:10:51 +0100 Subject: Revert "gnu: snappy: Update to 1.1.4." Rocksdb fails to build with this version: https://github.com/facebook/rocksdb/issues/1947 This reverts commit 9baab9aeeda394408290613c597bff1d96004dfb. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 6cdddb99a..aa2e14328 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -973,7 +973,7 @@ well as bzip2.") (define-public snappy (package (name "snappy") - (version "1.1.4") + (version "1.1.3") (source (origin (method url-fetch) (uri (string-append @@ -981,7 +981,7 @@ well as bzip2.") version "/" name "-" version ".tar.gz")) (sha256 (base32 - "0mq0nz8gbi1sp3y6xcg0a6wbvnd6gc717f3vh2xrjmfj5w9gwjqk")))) + "1wzf8yif5ym2gj52db6v5m1pxnmn258i38x7llk9x346y2nq47ig")))) (build-system gnu-build-system) (home-page "https://github.com/google/snappy") (synopsis "Fast compressor/decompressor") -- cgit v1.3 From 22ea02351f4fed0789d7d1c379690c1b08039fe8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Feb 2017 13:56:22 +0100 Subject: gnu: xmlstarlet: Disable failing tests. * gnu/packages/xml.scm (xmlstarlet)[arguments]: Add phase to disable two tests. --- gnu/packages/xml.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 66eb63ade..bd2748287 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1033,6 +1033,16 @@ C++ programming language.") (base32 "1jp737nvfcf6wyb54fla868yrr39kcbijijmjpyk4lrpyg23in0m")))) (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'check 'drop-failing-tests + (lambda _ + ;; FIXME: Why are these tests failing. + (substitute* "Makefile" + (("^examples/schema1\\\\") "\\") + (("^examples/valid1\\\\") "\\")) + #t))))) (inputs `(("libxslt" ,libxslt) ("libxml2" ,libxml2))) -- cgit v1.3 From dcfe44cbce97e887d033b6adefd7669f47c36e4f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 27 Dec 2016 21:40:41 +0100 Subject: gnu: Add ceph. * gnu/packages/storage.scm, gnu/packages/patches/ceph-disable-cpu-optimizations.patch, gnu/packages/patches/ceph-skip-collect-sys-info-test.patch, gnu/packages/patches/ceph-skip-unittest_blockdev.patch: New files. * gnu/local.mk (GNU_SYSTEM_MODULES, dist_patch_DATA): Register it. --- gnu/local.mk | 4 + .../patches/ceph-disable-cpu-optimizations.patch | 46 +++ .../patches/ceph-skip-collect-sys-info-test.patch | 29 ++ .../patches/ceph-skip-unittest_blockdev.patch | 28 ++ gnu/packages/storage.scm | 341 +++++++++++++++++++++ 5 files changed, 448 insertions(+) create mode 100644 gnu/packages/patches/ceph-disable-cpu-optimizations.patch create mode 100644 gnu/packages/patches/ceph-skip-collect-sys-info-test.patch create mode 100644 gnu/packages/patches/ceph-skip-unittest_blockdev.patch create mode 100644 gnu/packages/storage.scm (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index cc187e2d2..2466f57de 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -353,6 +353,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/ssh.scm \ %D%/packages/stalonetray.scm \ %D%/packages/statistics.scm \ + %D%/packages/storage.scm \ %D%/packages/suckless.scm \ %D%/packages/swig.scm \ %D%/packages/sync.scm \ @@ -508,6 +509,9 @@ dist_patch_DATA = \ %D%/packages/patches/calibre-drop-unrar.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/cdparanoia-fpic.patch \ + %D%/packages/patches/ceph-disable-cpu-optimizations.patch \ + %D%/packages/patches/ceph-skip-collect-sys-info-test.patch \ + %D%/packages/patches/ceph-skip-unittest_blockdev.patch \ %D%/packages/patches/chicken-CVE-2017-6949.patch \ %D%/packages/patches/chmlib-inttypes.patch \ %D%/packages/patches/clang-libc-search-path.patch \ diff --git a/gnu/packages/patches/ceph-disable-cpu-optimizations.patch b/gnu/packages/patches/ceph-disable-cpu-optimizations.patch new file mode 100644 index 000000000..f4d258b60 --- /dev/null +++ b/gnu/packages/patches/ceph-disable-cpu-optimizations.patch @@ -0,0 +1,46 @@ +Disable CPU optimizations not supported by the vast majority of +x86_64 systems. Also don't add anything for i686. + +--- a/cmake/modules/SIMDExt.cmake 2017-03-23 22:22:58.254071694 +0100 ++++ b/cmake/modules/SIMDExt.cmake 2017-03-23 22:23:22.446848845 +0100 +@@ -6,10 +6,6 @@ + # HAVE_INTEL_SSE + # HAVE_INTEL_SSE2 + # HAVE_INTEL_SSE3 +-# HAVE_INTEL_SSSE3 +-# HAVE_INTEL_PCLMUL +-# HAVE_INTEL_SSE4_1 +-# HAVE_INTEL_SSE4_2 + # + # SIMD_COMPILE_FLAGS + # +@@ -41,7 +37,7 @@ + if(HAVE_ARM_NEON) + set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mfpu=neon") + endif() +-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64") ++elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64") + set(HAVE_INTEL 1) + CHECK_C_COMPILER_FLAG(-msse HAVE_INTEL_SSE) + if(HAVE_INTEL_SSE) +@@ -55,20 +51,4 @@ + if(HAVE_INTEL_SSE3) + set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse3") + endif() +- CHECK_C_COMPILER_FLAG(-mssse3 HAVE_INTEL_SSSE3) +- if(HAVE_INTEL_SSSE3) +- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mssse3") +- endif() +- CHECK_C_COMPILER_FLAG(-mpclmul HAVE_INTEL_PCLMUL) +- if(HAVE_INTEL_PCLMUL) +- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mpclmul") +- endif() +- CHECK_C_COMPILER_FLAG(-msse4.1 HAVE_INTEL_SSE4_1) +- if(HAVE_INTEL_SSE4_1) +- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.1") +- endif() +- CHECK_C_COMPILER_FLAG(-msse4.2 HAVE_INTEL_SSE4_2) +- if(HAVE_INTEL_SSE4_2) +- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.2") +- endif() + endif() diff --git a/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch b/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch new file mode 100644 index 000000000..f21079925 --- /dev/null +++ b/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch @@ -0,0 +1,29 @@ +This test fails because /etc/os-release is not available. + +diff --git a/src/test/common/test_util.cc b/src/test/common/test_util.cc +index 288dd37db1..95b6cd4b30 100644 +--- a/src/test/common/test_util.cc ++++ b/src/test/common/test_util.cc +@@ -31,19 +31,3 @@ TEST(util, unit_to_bytesize) + + ASSERT_EQ(65536ll, unit_to_bytesize(" 64K", &cerr)); + } +- +-#if defined(__linux__) +-TEST(util, collect_sys_info) +-{ +- map sys_info; +- +- CephContext *cct = (new CephContext(CEPH_ENTITY_TYPE_CLIENT))->get(); +- collect_sys_info(&sys_info, cct); +- +- ASSERT_TRUE(sys_info.find("distro") != sys_info.end()); +- ASSERT_TRUE(sys_info.find("distro_version") != sys_info.end()); +- ASSERT_TRUE(sys_info.find("distro_description") != sys_info.end()); +- +- cct->put(); +-} +-#endif +-- +2.11.1 + diff --git a/gnu/packages/patches/ceph-skip-unittest_blockdev.patch b/gnu/packages/patches/ceph-skip-unittest_blockdev.patch new file mode 100644 index 000000000..43b998486 --- /dev/null +++ b/gnu/packages/patches/ceph-skip-unittest_blockdev.patch @@ -0,0 +1,28 @@ +This test tries to walk a sysfs path and hits a null pointer exception. + +/tmp/guix-build-ceph-12.0.0.drv-0/ceph-12.0.0/src/test/common/test_blkdev.cc:32: Failure +Expected: (dir) != (nullptr), actual: NULL vs 8-byte object <00-00 00-00 00-00 00-00> + +diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt +index 5172663898..ac84085eaa 100644 +--- a/src/test/common/CMakeLists.txt ++++ b/src/test/common/CMakeLists.txt +@@ -12,15 +12,6 @@ target_link_libraries(get_command_descriptions + ${CMAKE_DL_LIBS} + ) + +-if(HAVE_BLKID) +-# unittest_blkdev +-add_executable(unittest_blkdev +- test_blkdev.cc +- ) +-add_ceph_unittest(unittest_blkdev ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_blkdev) +-target_link_libraries(unittest_blkdev global ${BLKID_LIBRARIES}) +-endif(HAVE_BLKID) +- + # unittest_bloom_filter + add_executable(unittest_bloom_filter + test_bloom_filter.cc +-- +2.11.1 + diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm new file mode 100644 index 000000000..8207c2b38 --- /dev/null +++ b/gnu/packages/storage.scm @@ -0,0 +1,341 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2017 Marius Bakke +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages storage) + #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (guix build-system cmake) + #:use-module (gnu packages) + #:use-module (gnu packages admin) + #:use-module (gnu packages assembly) + #:use-module (gnu packages bdw-gc) + #:use-module (gnu packages boost) + #:use-module (gnu packages compression) + #:use-module (gnu packages crypto) + #:use-module (gnu packages cryptsetup) + #:use-module (gnu packages curl) + #:use-module (gnu packages databases) + #:use-module (gnu packages disk) + #:use-module (gnu packages gnuzilla) + #:use-module (gnu packages jemalloc) + #:use-module (gnu packages linux) + #:use-module (gnu packages lua) + #:use-module (gnu packages openldap) + #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages tls) + #:use-module (gnu packages web) + #:use-module (gnu packages xml)) + +(define-public ceph + (package + (name "ceph") + (version "12.0.0") + (source (origin + (method url-fetch) + (uri (string-append "https://download.ceph.com/tarballs/ceph-" + version ".tar.gz")) + (sha256 + (base32 + "0yzvwlwg85w04q4d9ac73vfpxjnl72dl6kc857ihv5k1lqbpp5d0")) + (patches + (search-patches "ceph-skip-unittest_blockdev.patch" + "ceph-skip-collect-sys-info-test.patch" + "ceph-disable-cpu-optimizations.patch")) + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file-recursively + '(;; TODO: Unbundle these: + ;"src/isa-l" + ;"src/lua" + ;"src/googletest" + ;"src/xxHash" + ;"src/zstd" + ;"src/civetweb" + ;"src/Beast" + "src/test/downloads" + "src/dpdk" + "src/spdk" + "src/rocksdb" + "src/boost")) + #t)))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (let* ((out (assoc-ref %outputs "out")) + (lib (assoc-ref %outputs "lib")) + (libdir (string-append lib "/lib"))) + (list (string-append "-DCMAKE_INSTALL_PREFIX=" out) + (string-append "-DCMAKE_INSTALL_LIBDIR=" libdir) + ;; We need both libdir and libdir/ceph in RUNPATH. + (string-append "-DCMAKE_INSTALL_RPATH=" + libdir ";" libdir "/ceph") + (string-append "-DCMAKE_INSTALL_SYSCONFDIR=" out "/etc") + (string-append "-DCMAKE_INSTALL_MANDIR=" out "/share/man") + (string-append "-DCMAKE_INSTALL_DOCDIR=" out "/share/ceph/doc") + (string-append "-DCMAKE_INSTALL_LIBEXECDIR=" out "/libexec") + (string-append "-DKEYUTILS_INCLUDE_DIR=" + (assoc-ref %build-inputs "keyutils") "/include") + "-DCMAKE_INSTALL_LOCALSTATEDIR=/var" + "-DENABLE_SHARED=ON" + "-DWITH_EMBEDDED=OFF" + "-DWITH_SYSTEM_ROCKSDB=ON" + "-DWITH_SYSTEM_BOOST=ON" + "-DWITH_PYTHON3=ON" + ;; TODO: Enable these when available in Guix. + "-DWITH_LTTNG=OFF" + "-DWITH_XFS=OFF" + "-DWITH_XIO=OFF" + ;; Use jemalloc instead of tcmalloc. + "-DALLOCATOR=jemalloc")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (lib (assoc-ref outputs "lib"))) + + ;; Make header files follow the dynamic libraries. + (substitute* "src/include/CMakeLists.txt" + (("DESTINATION include") + (string-append "DESTINATION " lib "/include"))) + + (substitute* "cmake/modules/Distutils.cmake" + ;; Prevent creation of Python eggs. + (("setup.py install") + "setup.py install --single-version-externally-managed --root=/")) + + (substitute* (find-files "src/pybind" "^setup\\.py$") + ;; Here we inject an extra line to the `setup.py' of the + ;; Python C libraries so RUNPATH gets set up correctly. + (("^([[:blank:]]+)extra_compile_args=(.*)$" _ indent args) + (string-append indent "extra_compile_args=" args + indent "extra_link_args=['-Wl,-rpath=" + lib "/lib'],\n"))) + + (substitute* "src/ceph-disk/tox.ini" + ;; Disable flake8 test since it complains about too long lines. + (("envlist = flake8,py27") "envlist = py27")) + + (substitute* "src/ceph-detect-init/tox.ini" + ;; Disable python3 tests until we at least get py2 working. + (("envlist = pep8,py27,py3") "envlist = pep8,py27")) + + (substitute* "src/key_value_store/kv_flat_btree_async.cc" + (("/usr/include/") "")) + + (substitute* "src/test/test_subprocess.cc" + (("/bin/sh") (which "sh"))) + (substitute* "src/test/ceph_objectstore_tool.py" + (("/bin/rm") (which "rm"))) + (substitute* "src/ceph-disk/ceph_disk/main.py" + (("/bin/mount") "mount") + (("/bin/umount") "umount") + (("/sbin/blkid") (which "blkid")) + (("'sgdisk'") (string-append "'" (which "sgdisk") "'")) + (("'parted'") (string-append "'" (which "parted") "'")) + (("'udevadm'") (string-append "'" (which "udevadm") "'"))) + + (substitute* "src/ceph-disk-udev" + (("/sbin/cryptsetup") (which "cryptsetup")) + (("/usr/sbin/sgdisk") (which "sgdisk")) + (("/usr/sbin/ceph-disk") + (string-append out "/bin/ceph-disk"))) + (substitute* "udev/50-rbd.rules" + (("/usr/bin/ceph-rbdnamer") + (string-append out "/bin/ceph-rbdnamer"))) + (substitute* "udev/60-ceph-by-parttypeuuid.rules" + (("/sbin/blkid") (which "blkid"))) + (substitute* "udev/95-ceph-osd.rules" + (("/usr/sbin/ceph-disk") + (string-append out "/bin/ceph-disk"))) + + (substitute* "src/test/run-cli-tests" + ;; Use our python-cram instead of the (un)bundled one. + (("CRAM_BIN=.*$") + (string-append "CRAM_BIN=" (which "cram") "\n"))) + + ;; Disable tests that are known to fail. + ;; TODO: The majority of these fail because + ;; 'qa/workunits/ceph-helpers.sh' expects to find + ;; /tmp/ceph-disk-virtualenv/bin/ceph-disk, but somehow + ;; src/ceph-disk/CMakeLists.txt fails to create it. + (substitute* "src/test/CMakeLists.txt" + ;; FIXME: "create cannot load compressor of type zlib" + ;; "libceph_zlib.so: undefined symbol: isal_deflate" + (("^add_subdirectory\\(compressor\\)") "") + ;; FIXME: These tests fails because `ceph-disk' + ;; is not available. + (("^add_ceph_test\\(test-ceph-helpers\\.sh.*$") "\n") + (("^add_ceph_test\\(test_pidfile\\.sh.*$") "\n") + ;; XXX Why does this fail. + (("^add_ceph_test\\(cephtool-test-mon\\.sh.*$") "\n") + ;; This fails due to missing '/etc/fstab'. + (("^add_ceph_test\\(cephtool-test-rados\\.sh.*$") "\n") + ;; `Bad messages to stderr: OSD has the store locked' + (("^add_ceph_test\\(ceph_objectstore_tool\\.py.*$") "\n") + ;; The bundled python-cram fork needs patching to work on + ;; guix, and the system version does not support --error-dir. + ;; https://bitbucket.org/brodie/cram/issues/9 + (("^add_ceph_test\\(run-cli-tests.*$") "\n") + ;; FIXME: tox/virtualenv/pip does not discover the + ;; required packages and tries to go online. + (("^add_test\\(NAME run-tox-ceph-disk.*$") "\n") + (("^add_test\\(NAME run-tox-ceph-detect-init.*$") "\n") + ;; Also remove from the set_property block. + (("run-tox-ceph-disk") "") + (("run-tox-ceph-detect-init") "")) + ;; More 'ceph-disk' issues here.. :-( + (substitute* "src/test/erasure-code/CMakeLists.txt" + (("^add_ceph_test\\(test-erasure-code-plugins\\.sh.*$") "\n") + (("^add_ceph_test\\(test-erasure-code\\.sh.*$") "\n") + (("^add_ceph_test\\(test-erasure-eio\\.sh.*$") "\n")) + (substitute* "src/test/libradosstriper/CMakeLists.txt" + (("^add_ceph_test\\(rados-striper\\.sh.*$") "\n")) + (substitute* "src/test/mon/CMakeLists.txt" + (("^add_ceph_test\\(osd-crush\\.sh.*$") "\n") + (("^add_ceph_test\\(test_pool_quota\\.sh.*$") "\n") + (("^add_ceph_test\\(osd-pool-create\\.sh.*$") "\n")) + (substitute* "src/test/osd/CMakeLists.txt" + (("^add_ceph_test\\(osd-bench\\.sh.*$") "\n") + (("^add_ceph_test\\(osd-config\\.sh.*$") "\n") + (("^add_ceph_test\\(osd-markdown\\.sh.*$") "\n") + (("^add_ceph_test\\(osd-reactivate\\.sh.*$") "\n") + (("^add_ceph_test\\(osd-reuse-id\\.sh.*$") "\n") + (("^add_ceph_test\\(osd-scrub-repair\\.sh.*$") "\n") + (("^add_ceph_test\\(osd-scrub-snaps\\.sh.*$") "\n") + (("^add_ceph_test\\(osd-copy-from\\.sh.*$") "\n") + (("^add_ceph_test\\(osd-fast-mark-down\\.sh.*$") "\n")) + #t))) + (add-before 'check 'set-check-environment + (lambda _ + ;; Run tests in parallel. + (setenv "CTEST_PARALLEL_LEVEL" + (number->string (parallel-job-count))) + ;; `pip' requires write access in $HOME. + (setenv "HOME" "/tmp") + #t)) + (add-before 'install 'set-install-environment + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (py2sitedir + (string-append out "/lib/python2.7/site-packages")) + (py3sitedir + (string-append out "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages"))) + ;; The Python install scripts refuses to function if + ;; the install directory is not on PYTHONPATH. + (setenv "PYTHONPATH" + (string-append py2sitedir ":" py3sitedir ":" + (getenv "PYTHONPATH"))) + #t))) + (add-after 'install 'wrap-python-scripts + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (ceph-disk (string-append out "/bin/ceph-disk")) + (ceph-detect-init (string-append + out "/bin/ceph-detect-init")) + (PYTHONPATH (string-append + out "/lib/python2.7/site-packages"))) + + (for-each (lambda (executable) + (wrap-program executable + `("PYTHONPATH" ":" prefix (,PYTHONPATH)))) + (list ceph-disk ceph-detect-init)) + #t)))))) + (outputs + '("out" "lib")) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python-cython" ,python-cython) + ("python-sphinx" ,python-sphinx) + ("yasm" ,yasm) + + ;; For tests. + ("inetutils" ,inetutils) + ("jq" ,jq) + ("perl" ,perl) + ("xmlstarlet" ,xmlstarlet) + ("python2-cram" ,python2-cram) + ("python2-virtualenv" ,python2-virtualenv) + + ;; These dependencies are taken from test-requirements.txt + ;; of ceph-disk and ceph-detect-init. The latter can also + ;; test against python3, but let's try to get python2 tests + ;; working first since that is the default. + ("python2-configobj" ,python2-configobj) + ("python2-coverage" ,python2-coverage) + ("python2-discover" ,python2-discover) + ("python2-fixtures" ,python2-fixtures) + ("python2-flake8" ,python2-flake8) + ("python2-mock" ,python2-mock) + ("python2-nose" ,python2-nose) + ("python2-pip" ,python2-pip) + ("python2-pytest" ,python2-pytest) + ("python2-subunit" ,python2-subunit) + ("python2-testrepository" ,python2-testrepository) + ("python2-testtools" ,python2-testtools) + ("python2-tox" ,python2-tox))) + (inputs + `(("boost" ,boost) + ("curl" ,curl) + ("cryptsetup" ,cryptsetup) + ("expat" ,expat) + ("fcgi" ,fcgi) + ("fuse" ,fuse) + ("gptfdisk" ,gptfdisk) + ("jemalloc" ,jemalloc) + ("keyutils" ,keyutils) + ("leveldb" ,leveldb) + ("libaio" ,libaio) + ("libatomic-ops" ,libatomic-ops) + ("lua" ,lua) + ("lz4" ,lz4) + ("openldap" ,openldap) + ("openssl" ,openssl) + ("nss" ,nss) + ("parted" ,parted) + ("python@2" ,python-2) + ("python@3" ,python-3) + ("rocksdb" ,rocksdb) + ("snappy" ,snappy) + ("udev" ,eudev) + ("util-linux" ,util-linux) + ("zlib" ,zlib))) + (home-page "https://ceph.com/") + (synopsis "Distributed object store and file system") + (description + "Ceph is a distributed storage system designed for reliability and +performance. It provides network-based block devices (RBD), a POSIX +compliant filesystem (CephFS), and offers compatibility with various +storage protocols (S3, NFS, and others) through the RADOS gateway.") + ;; The Ceph libraries are LGPL2.1 and most of the utilities fall under + ;; GPL2. The installed erasure code plugins are BSD-3 licensed and do + ;; not use the GPL code. The source archive includes a number of files + ;; carrying other licenses; consult COPYING for more information. Note + ;; that COPYING does not cover third-party bundled software. + (license (list license:lgpl2.1 license:gpl2 ;some files are 'or later' + license:cc-by-sa3.0 ;documentation + license:bsd-3 ;isa-l,jerasure,++ + license:expat)))) ;civetweb,java bindings -- cgit v1.3 From aadead6f17ef240714d06513e8b4f42b9f0ecf85 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Jan 2017 19:36:25 +0100 Subject: gnu: fio: Enable rbd support. * gnu/packages/benchmark.scm (fio)[inputs]: Add ceph:lib. --- gnu/packages/benchmark.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 9f6381eb4..4dab62099 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -24,7 +24,8 @@ #:use-module (gnu packages compression) #:use-module (gnu packages linux) #:use-module (gnu packages maths) - #:use-module (gnu packages python)) + #:use-module (gnu packages python) + #:use-module (gnu packages storage)) (define-public fio (package @@ -85,7 +86,8 @@ #t)))))) (outputs '("out" "utils")) (inputs - `(("libaio" ,libaio) + `(("ceph" ,ceph "lib") + ("libaio" ,libaio) ("gnuplot" ,gnuplot) ("zlib" ,zlib) ("python-numpy" ,python2-numpy) -- cgit v1.3 From b3ed50e6ad22ef0782dff7ee7700cd4c817866af Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Feb 2017 01:02:08 +0100 Subject: gnu: Add multipath-tools. * gnu/packages/linux.scm (multipath-tools): New variable. --- gnu/packages/linux.scm | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9a466e0ad..608cb2975 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -53,6 +53,7 @@ #:use-module (gnu packages crypto) #:use-module (gnu packages compression) #:use-module (gnu packages databases) + #:use-module (gnu packages datastructures) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages elf) @@ -78,8 +79,10 @@ #:use-module (gnu packages readline) #:use-module (gnu packages rrdtool) #:use-module (gnu packages slang) + #:use-module (gnu packages storage) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) + #:use-module (gnu packages valgrind) #:use-module (gnu packages video) #:use-module (gnu packages xiph) #:use-module (gnu packages xml) @@ -2583,6 +2586,67 @@ arrays when needed.") '("out")))) ;refer only self (synopsis "Statically-linked 'mdadm' command for use in an initrd"))) +(define-public multipath-tools + (package + (name "multipath-tools") + (version "0.6.4") + (source (origin + (method url-fetch) + (uri (string-append "http://git.opensvc.com/?p=multipath-tools/" + ".git;a=snapshot;h=" version ";sf=tgz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "12smwmljrkl2afc06dghd2253rqnfawvzr818a2xpxr06f44f9qy")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Drop bundled valgrind headers. + (delete-file-recursively "third-party") + (substitute* '("multipathd/main.c" + "libmultipath/debug.c") + (("#include \"../third-party/") + "#include \"")) + #t)))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; No tests. + #:make-flags (list (string-append "DESTDIR=" + (assoc-ref %outputs "out")) + (string-append "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") + "/lib")) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'set-CC + (lambda _ + (setenv "CC" "gcc") + #t))))) + (native-inputs + `(("valgrind" ,valgrind))) + (inputs + `(("ceph:lib" ,ceph "lib") + ("libaio" ,libaio) + ("liburcu" ,liburcu) + ("lvm2" ,lvm2) + ("readline" ,readline) + ("udev" ,eudev))) + (home-page "http://christophe.varoqui.free.fr/") + (synopsis "Access block devices through multiple paths") + (description + "This package provides the following binaries to drive the +Linux Device Mapper multipathing driver: +@enumerate +@item @command{multipath} - Device mapper target autoconfig. +@item @command{multipathd} - Multipath daemon. +@item @command{mpathpersist} - Manages SCSI persistent reservations on +@code{dm} multipath devices. +@item @command{kpartx} - Create device maps from partition tables. +@end enumerate") + (license (list license:gpl2+ ; Main distribution. + license:lgpl2.0+)))) ; libmpathcmd/mpath_cmd.h + (define-public libaio (package (name "libaio") -- cgit v1.3 From f8f44dd7384d1cfc30158917b543e68c132cd60a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 17 Mar 2017 09:27:31 +0100 Subject: gnu: Add rdma-core. * gnu/packages/linux.scm (rdma-core): New variable. --- gnu/packages/linux.scm | 71 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 608cb2975..ed74aa50a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016 David Craven ;;; Copyright © 2016 John Darrington -;;; Copyright © 2016 Marius Bakke +;;; Copyright © 2016, 2017 Marius Bakke ;;; Copyright © 2016 Rene Saavedra ;;; Copyright © 2016 ng0 ;;; Copyright © 2017 Leo Famulari @@ -70,6 +70,7 @@ #:use-module (gnu packages maths) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) + #:use-module (gnu packages ninja) #:use-module (gnu packages perl) #:use-module (gnu packages pciutils) #:use-module (gnu packages pkg-config) @@ -3031,6 +3032,74 @@ commonly found on Microsoft Windows. It is implemented as a FUSE file system. The package provides additional NTFS tools.") (license license:gpl2+))) +(define-public rdma-core + (package + (name "rdma-core") + (version "13") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/linux-rdma/rdma-core" + "/releases/download/v" version "/rdma-core-" + version ".tar.gz")) + (sha256 + (base32 + "15qdfqkia22vab1dh41s88vgi70yifi40ar5s4x7a456rpbhy8z5")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f ; no tests + ;; Upstream uses the "ninja" build system and encourage distros + ;; to do the same for consistency. They also recommend using the + ;; "Release" build type. + #:configure-flags (list "-GNinja" + ;; Defaults to "lib64" on 64-bit archs. + (string-append "-DCMAKE_INSTALL_LIBDIR=" + (assoc-ref %outputs "out") "/lib") + "-DCMAKE_BUILD_TYPE=Release") + #:phases + (modify-phases %standard-phases + (replace 'build + (lambda _ + (zero? (system* "ninja" + "-j" (number->string (parallel-job-count)))))) + (replace 'install + (lambda _ + (zero? (system* "ninja" "install"))))))) + (native-inputs + `(("ninja" ,ninja) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (inputs + `(("libnl" ,libnl) + ("udev" ,eudev))) + (home-page "https://github.com/linux-rdma/rdma-core") + (synopsis "Utilities and libraries for working with RDMA devices") + (description + "This package provides userspace components for the InfiniBand +subsystem of the Linux kernel. Specifically it contains userspace +libraries for the following device nodes: + +@enumerate +@item @file{/dev/infiniband/uverbsX} (@code{libibverbs}) +@item @file{/dev/infiniband/rdma_cm} (@code{librdmacm}) +@item @file{/dev/infiniband/umadX} (@code{libibumad}) +@end enumerate + +The following service daemons are also provided: +@enumerate +@item @code{srp_daemon} (for the @code{ib_srp} kernel module) +@item @code{iwpmd} (for iWARP kernel providers) +@item @code{ibacm} (for InfiniBand communication management assistant) +@end enumerate") + ;; All library code is dual licensed under GPL2 and a custom MIT + ;; variant. The package also includes some components covered by + ;; other licenses. Consult COPYING.md for full details. + (license + (list license:gpl2 + (license:x11-style "See COPYING.BSD_MIT in the distribution") + license:bsd-2 ; Files referring to COPYING.BSD_FB + license:cc0 ; most files in ccan/ + license:bsd-3)))) ; providers/hfi1verbs are dual GPL2/BSD-3 + (define-public rng-tools (package (name "rng-tools") -- cgit v1.3 From 2e93ee5f1b44386ec39e221b6fc9271b7eb6ab5e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Mar 2017 20:11:02 +0200 Subject: gnu: rocksdb: Update to 5.2.1. * gnu/packages/databases.scm (rocksdb): Update to 5.2.1. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 454927272..b87e8a210 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -516,7 +516,7 @@ types are supported, as is encryption.") (define-public rocksdb (package (name "rocksdb") - (version "5.1.4") + (version "5.2.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/facebook/rocksdb" @@ -524,7 +524,7 @@ types are supported, as is encryption.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0ddyj8lh5jk6vx675pdg4jhgs7c12ckw5j31rz85jlrds68ygrry")) + "1v2q05bl56sfp51m09z7g6489hkfq4vf6b4qgfg3d96ylgmay9yb")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.3 From 59d915ac37192f8e7281414e5db948db85e8a014 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 28 Mar 2017 10:31:45 +0530 Subject: gnu: shroud: Fix home page URL. * gnu/packages/password-utils.scm (shroud)[home-page]: Update URL. Signed-off-by: Leo Famulari --- gnu/packages/password-utils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 3f125a011..4910e990f 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -136,7 +136,7 @@ encrypted with a GnuPG key. Secrets consist of an arbitrary number of key/value pairs, making Shroud suitable for more than just password storage. For copying and pasting secrets into web browsers and other graphical applications, there is xclip integration." ) - (home-page "http://dthompson.us/pages/software/shroud.html") + (home-page "https://dthompson.us/projects/shroud.html") (license license:gpl3+))) (define-public yapet -- cgit v1.3 From a652eb9331037e0d932ca05af37a40fc19e6919e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 28 Mar 2017 15:22:16 -0400 Subject: gnu: shroud: Use HTTPS source URL. * gnu/packages/password-utils.scm (shroud)[source]: Use HTTPS URL. --- gnu/packages/password-utils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 4910e990f..66d5f8cf8 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -108,7 +108,7 @@ algorithms AES or Twofish.") (version "0.1.1") (source (origin (method url-fetch) - (uri (string-append "http://files.dthompson.us/shroud/shroud-" + (uri (string-append "https://files.dthompson.us/shroud/shroud-" version ".tar.gz")) (sha256 (base32 -- cgit v1.3 From 7f71e2579aca806be2fd30211fddeea69cafe31e Mon Sep 17 00:00:00 2001 From: Muriithi Frederick Muriuki Date: Sun, 26 Mar 2017 12:23:32 +0300 Subject: gnu: Add python-pytest@3.0.7 * gnu/packages/python.scm (python-pytest-3.0.7): New variable. Signed-off-by: Leo Famulari --- gnu/packages/python.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c3e4a3795..e804da902 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1843,6 +1843,24 @@ and many external plugins.") line))) #t))))))) +;; This package is used by Sphinx version 1.5.2 and up +(define-public python-pytest-3.0.7 + (package + (inherit python-pytest-2.9.2) + (name "python-pytest") + (version "3.0.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest" version)) + (sha256 + (base32 + "1asc4b2nd2a4f0g3r12y97rslq5wliji7b73wwkvdrm5s7mrc1mp")))) + (native-inputs + `(("python-nose" ,python-nose) + ("python-mock" ,python-mock) + ("python-hypothesis" ,python-hypothesis))))) + (define-public python-pytest-cov (package (name "python-pytest-cov") -- cgit v1.3 From 3061b33190b0e9b979255d70cbe3bc92a2e1e38d Mon Sep 17 00:00:00 2001 From: Muriithi Frederick Muriuki Date: Tue, 28 Mar 2017 15:32:17 -0400 Subject: gnu: Add python-sphinx@1.5.3. * gnu/packages/python.scm (python-sphinx-1.5.3): New variable. --- gnu/packages/python.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e804da902..ebb61f19b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3102,6 +3102,22 @@ sources.") (license license:bsd-3) (properties `((python2-variant . ,(delay python2-sphinx)))))) +(define-public python-sphinx-1.5.3 + (package + (inherit python-sphinx) + (name "python-sphinx") + (version "1.5.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "Sphinx" version)) + (sha256 + (base32 + "0kw1axswbvaavr8ggyf4qr6hnisnrzlbkkcdada69vk1x9xjassg")))) + (native-inputs + `(("python-pytest" ,python-pytest-3.0.7) + ,@(package-native-inputs python-sphinx))))) + (define-public python2-sphinx (let ((base (package-with-python2 (strip-python2-variant python-sphinx)))) (package -- cgit v1.3 From 5d0c3ba856e39be207debdf5091b4431dd726273 Mon Sep 17 00:00:00 2001 From: Muriithi Frederick Muriuki Date: Sun, 26 Mar 2017 12:23:34 +0300 Subject: gnu: Add python-paramunittest * gnu/packages/python.scm (python-paramunittest, python2-paramunittest): New variables. Signed-off-by: Leo Famulari --- gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ebb61f19b..de459e5b3 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13914,3 +13914,29 @@ possible to write plugins to add your own checks.") ,python2-backports-functools-lru-cache) ("python2-configparser" ,python2-configparser) ,@(package-propagated-inputs pylint)))))) + +(define-public python-paramunittest + (package + (name "python-paramunittest") + (version "0.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ParamUnittest" version)) + (sha256 + (base32 + "0kp793hws5xv1wvycxq7jw2pwy36f35k39jg8hx5qikij5a0jid1")))) + (build-system python-build-system) + (home-page + "https://github.com/rik0/ParamUnittest") + (synopsis + "Simple extension to have parametrized unit tests") + (description + "This package allows to create parametrized unit-tests that work with the standard +unittest package. A parametrized test case is automatically converted to multiple test +cases. Since they are TestCase subclasses, they work with other test suites that +recognize TestCases.") + (license license:bsd-2))) + +(define-public python2-python-paramunittest + (package-with-python2 python-paramunittest)) -- cgit v1.3 From eec21d4be7f200d227d8ed9dfb2168bdff2d43d2 Mon Sep 17 00:00:00 2001 From: Muriithi Frederick Muriuki Date: Sun, 26 Mar 2017 12:23:35 +0300 Subject: gnu: Add python-mando * gnu/packages/python.scm (python-mando, python2-mando): New variables. Signed-off-by: Leo Famulari --- gnu/packages/python.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index de459e5b3..ec80cf13c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13940,3 +13940,31 @@ recognize TestCases.") (define-public python2-python-paramunittest (package-with-python2 python-paramunittest)) + +(define-public python-mando + (package + (name "python-mando") + (version "0.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "mando" version)) + (sha256 + (base32 + "0q05h66439gqdmlk4jqm6xrwrzfdgs4mwk70barxhr2y83qbbdc0")))) + (build-system python-build-system) + (propagated-inputs + `(("python-rst2ansi" ,python-rst2ansi))) + (native-inputs + `(("python-sphinx" ,python-sphinx-1.5.3) + ("python-paramunittest" ,python-paramunittest))) + (home-page "https://mando.readthedocs.org/") + (synopsis + "Wrapper around argparse, allowing creation of complete CLI applications") + (description + "This package is a wrapper around argparse, allowing you to write complete CLI + applications in seconds while maintaining all the flexibility.") + (license license:expat))) + +(define-public python2-mando + (package-with-python2 python-mando)) -- cgit v1.3 From 23b9168dcdb0bdd47f74a81dc9653e1e05142a14 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 28 Mar 2017 15:40:37 -0400 Subject: gnu: python-pytest-2.9.2: Replace with python-pytest-3.0. * gnu/packages/python.scm (python-pytest-2.9.2): Replace with ... (python-pytest-3.0): ... new variable. (python2-pytest-3.0): New variable. (python-cryptography, python2-cryptography, python-sphinx-1.5.3)[native-inputs]: Replace python-pytest-2.9.2 with python-pytest-3.0. * gnu/packages/backup.scm (borg)[native-inputs]: Likewise. gnu/packages/calendar.scm (khal)[native-inputs]: Likewise. --- gnu/packages/backup.scm | 2 +- gnu/packages/calendar.scm | 2 +- gnu/packages/python.scm | 40 +++++++++++++++++----------------------- 3 files changed, 19 insertions(+), 25 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 7e9ae18f3..8e1f19515 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -529,7 +529,7 @@ detection, and lossless compression.") ("python-setuptools-scm" ,python-setuptools-scm) ;; Borg 1.0.8's test suite uses 'tmpdir_factory', which was introduced in ;; pytest 2.8. - ("python-pytest" ,python-pytest-2.9.2) + ("python-pytest" ,python-pytest-3.0) ;; For generating the documentation. ("python-sphinx" ,python-sphinx) ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme))) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 1e9a93ca9..977111bfe 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -113,7 +113,7 @@ data units.") (zero? (system* "py.test" "tests"))))))) (native-inputs ;; XXX Uses tmpdir_factory, introduced in pytest 2.8. - `(("python-pytest" ,python-pytest-2.9.2) + `(("python-pytest" ,python-pytest-3.0) ("python-pytest-cov" ,python-pytest-cov) ("python-setuptools-scm" ,python-setuptools-scm) ;; Required for tests diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ec80cf13c..f98933868 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1818,19 +1818,18 @@ and many external plugins.") (define-public python2-pytest (package-with-python2 python-pytest)) -;; This package is used by Borg until we can upgrade all our Python packages to -;; use a more recent pytest. -(define-public python-pytest-2.9.2 +;; Some packages require a newer pytest. +(define-public python-pytest-3.0 (package (inherit python-pytest) (name "python-pytest") - (version "2.9.2") + (version "3.0.7") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) (sha256 (base32 - "1n6igbc1b138wx1q5gca4pqw1j6nsyicfxds5n0b5989kaxqmh8j")))) + "1asc4b2nd2a4f0g3r12y97rslq5wliji7b73wwkvdrm5s7mrc1mp")))) (arguments `(#:phases (modify-phases %standard-phases @@ -1841,25 +1840,20 @@ and many external plugins.") (string-append "@pytest.mark.skip" "(reason=\"Assumes that /usr exists.\")\n " line))) - #t))))))) - -;; This package is used by Sphinx version 1.5.2 and up -(define-public python-pytest-3.0.7 - (package - (inherit python-pytest-2.9.2) - (name "python-pytest") - (version "3.0.7") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pytest" version)) - (sha256 - (base32 - "1asc4b2nd2a4f0g3r12y97rslq5wliji7b73wwkvdrm5s7mrc1mp")))) + #t))))) (native-inputs `(("python-nose" ,python-nose) ("python-mock" ,python-mock) - ("python-hypothesis" ,python-hypothesis))))) + ("python-hypothesis" ,python-hypothesis))) + (properties `((python2-variant . ,(delay python2-pytest-3.0)))))) + +(define-public python2-pytest-3.0 + (let ((base (package-with-python2 + (strip-python2-variant python-pytest-3.0)))) + (package (inherit base) + (native-inputs + `(("python2-enum34" ,python2-enum34) + ,@(package-native-inputs base)))))) (define-public python-pytest-cov (package @@ -3115,7 +3109,7 @@ sources.") (base32 "0kw1axswbvaavr8ggyf4qr6hnisnrzlbkkcdada69vk1x9xjassg")))) (native-inputs - `(("python-pytest" ,python-pytest-3.0.7) + `(("python-pytest" ,python-pytest-3.0) ,@(package-native-inputs python-sphinx))))) (define-public python2-sphinx @@ -7315,7 +7309,7 @@ responses, rather than doing any computation.") ("python-pyasn1" ,python-pyasn1) ("python-pyasn1-modules" ,python-pyasn1-modules) ("python-pytz" ,python-pytz) - ("python-pytest" ,python-pytest-2.9.2))) + ("python-pytest" ,python-pytest-3.0))) (home-page "https://github.com/pyca/cryptography") (synopsis "Cryptographic recipes and primitives for Python") (description -- cgit v1.3 From e1f02f92e90dac57431c3a0c557162fe1d5e9192 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 28 Mar 2017 17:12:20 +0200 Subject: Replace (compose not PROC) with simpler idioms. * gnu/packages/bioinformatics.scm (python-pysam)[arguments] : Use (negate proc) instead of (compose not proc). * guix/import/cran.scm (recursive-import): Likewise. * guix/import/elpa.scm (filter-dependencies): Use 'remove' instead of '(filter (compose not proc) ...)'. --- gnu/packages/bioinformatics.scm | 2 +- guix/import/cran.scm | 2 +- guix/import/elpa.scm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 232c7db83..477ad60f7 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1454,7 +1454,7 @@ multiple sequence alignments.") (getenv "PYTHONPATH") ":" (getcwd) "/build/" (car (scandir "build" - (compose not (cut string-prefix? "." <>)))))) + (negate (cut string-prefix? "." <>)))))) ;; Step out of source dir so python does not import from CWD. (with-directory-excursion "tests" (setenv "HOME" "/tmp") diff --git a/guix/import/cran.scm b/guix/import/cran.scm index 0d3ce5aa2..a5f91fe8d 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -336,7 +336,7 @@ dependencies." (cran->guix-package (next state) repo)) ;; predicate - (compose not done?) + (negate done?) ;; generator: update the queue (lambda (state) diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index c0b0c415c..b1003304d 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -57,7 +57,7 @@ past were distributed separately from Emacs." (define (filter-dependencies names) "Remove the package names included with Emacs from the list of NAMES (strings)." - (filter (compose not emacs-standard-library?) names)) + (remove emacs-standard-library? names)) (define (elpa-name->package-name name) "Given the NAME of an Emacs package, return the corresponding Guix name." -- cgit v1.3 From 6bd4a88989cc407ae7cb119f55cb99de7deb8e37 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Tue, 28 Mar 2017 13:52:25 -0400 Subject: gnu: emacs-elfeed: Update to 2.1.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-elfeed): Update to 2.1.0. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 4fe2ffa4d..fbd5b0805 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 Vasile Dumitrascu +;;; Copyright © 2017 Kyle Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -3089,7 +3090,7 @@ If you want to mark a folder manually as a project just create an empty (define-public emacs-elfeed (package (name "emacs-elfeed") - (version "1.4.1") + (version "2.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/skeeto/elfeed/archive/" @@ -3097,7 +3098,7 @@ If you want to mark a folder manually as a project just create an empty (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0i75r8x9ypbfjlnym04h16ikcrlks86p7wsgawrx7mh1lk4inp89")))) + "145glas04zd0s2rmnif46vhyijs4z03v871gfp1dcrwxvvvns8ap")))) (build-system emacs-build-system) (home-page "https://github.com/skeeto/elfeed") (synopsis "Atom/RSS feed reader for Emacs") -- cgit v1.3 From 7f7d52cc9a72dc079eaa1cc2d3e68bd80dae12ec Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 23 Jan 2017 15:42:45 +0000 Subject: gnu: Add lxmenu-data. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxde.scm (lxmenu-data): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/lxde.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index e8db6271f..ea150ffc3 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -219,4 +219,27 @@ with freedesktop.org standard.") (home-page "http://lxde.org") (license license:gpl2+))) +(define-public lxmenu-data + (package + (name "lxmenu-data") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://downloads.sourceforge.net/lxde/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1f5sh2dvb3pdnjlcsyzq9543ck2jsqizkx3204cr22zm5s6j3qwz")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool))) + (synopsis "Freedesktop.org desktop menus for LXDE") + (description + "Lxmenu-data provides files required to build freedesktop.org +menu spec-compliant desktop menus for LXDE.") + (home-page "http://lxde.org") + (license license:lgpl2.1+))) + ;;; lxde.scm ends here -- cgit v1.3 From 4dcbed572c8ceaca723fbb8938e5dede3c2023ff Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 23 Jan 2017 15:53:08 +0000 Subject: gnu: Add lxde-icon-theme. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxde.scm (lxde-icon-theme): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/lxde.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index ea150ffc3..9a4fe7596 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -242,4 +242,25 @@ menu spec-compliant desktop menus for LXDE.") (home-page "http://lxde.org") (license license:lgpl2.1+))) +(define-public lxde-icon-theme + (package + (name "lxde-icon-theme") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://downloads.sourceforge.net/lxde/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0v4i6x86fr2hbx4fb2si7y2qzmj7h6hcjwaifnin18r8kwwvgl73")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (synopsis "LXDE default icon theme based on nuoveXT2") + (description + "Lxde-icon-theme provides an default icon theme for LXDE.") + (home-page "http://lxde.org") + (license license:lgpl3))) + ;;; lxde.scm ends here -- cgit v1.3 From 169274d5c58cf3ce385d8ce0b64e2ac57a68906c Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 23 Jan 2017 15:59:47 +0000 Subject: gnu: Add lxde-common. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxde.scm (lxde-common): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/lxde.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 9a4fe7596..6862784f4 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -263,4 +263,28 @@ menu spec-compliant desktop menus for LXDE.") (home-page "http://lxde.org") (license license:lgpl3))) +(define-public lxde-common + (package + (name "lxde-common") + (version "0.99.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://downloads.sourceforge.net/lxde/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0mj84fa3f4ak1jjslrwc2q3ci9zxrxpciggviza9bjb0168brn8w")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("lxmenu-data" ,lxmenu-data) + ("lxde-icon-theme" ,lxde-icon-theme))) + (synopsis "Common files of the LXDE Desktop") + (description + "Lxde-common provides common files of the LXDE Desktop.") + (home-page "http://lxde.org") + (license license:gpl2+))) + ;;; lxde.scm ends here -- cgit v1.3 From f3b3af37d4ab2ad621fee64469dff4f49bec805d Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 23 Jan 2017 16:10:15 +0000 Subject: gnu: Add lxinput. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxde.scm (lxinput): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/lxde.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 6862784f4..1a3cfab0b 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -287,4 +287,29 @@ menu spec-compliant desktop menus for LXDE.") (home-page "http://lxde.org") (license license:gpl2+))) +(define-public lxinput + (package + (name "lxinput") + (version "0.3.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://downloads.sourceforge.net/lxde/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "123f3yn4rp1w5b3n5aj3ad9snkxab29qkrs7bcvf5bx4cn57g3sf")))) + (build-system gnu-build-system) + (inputs + `(("gtk+-2" ,gtk+-2))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool))) + (synopsis "Tool for mouse and keyboard configuration in LXDE") + (description + "Lxinput provides a small program to configure keyboard and mouse +in LXDE.") + (home-page "http://lxde.org") + (license license:gpl2+))) + ;;; lxde.scm ends here -- cgit v1.3 From d3897349e9a8a75983d9109a6bbf6684d0750a0b Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 23 Jan 2017 16:39:12 +0000 Subject: gnu: Add lxsession. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxde.scm (lxsession): New variable. * gnu/packages/patches/lxsession-use-gapplication.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/lxde.scm | 42 ++++++ .../patches/lxsession-use-gapplication.patch | 152 +++++++++++++++++++++ 3 files changed, 195 insertions(+) create mode 100644 gnu/packages/patches/lxsession-use-gapplication.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 2466f57de..34642af45 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -753,6 +753,7 @@ dist_patch_DATA = \ %D%/packages/patches/luajit-symlinks.patch \ %D%/packages/patches/luit-posix.patch \ %D%/packages/patches/lvm2-static-link.patch \ + %D%/packages/patches/lxsession-use-gapplication.patch \ %D%/packages/patches/make-impure-dirs.patch \ %D%/packages/patches/mars-install.patch \ %D%/packages/patches/mars-sfml-2.3.patch \ diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 1a3cfab0b..87f96493c 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -19,11 +19,14 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages lxde) + #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages docbook) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages polkit) #:use-module (gnu packages xorg) #:use-module (guix build-system gnu) #:use-module (guix download) @@ -312,4 +315,43 @@ in LXDE.") (home-page "http://lxde.org") (license license:gpl2+))) +(define-public lxsession + (package + (name "lxsession") + (version "0.5.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://downloads.sourceforge.net/lxde/" + name "-" version ".tar.xz")) + (patches (search-patches "lxsession-use-gapplication.patch")) + (sha256 + (base32 + "1a0zmyywwzdh59nc0l94cir18vhp633z4q2xfhn5zx11ajj45gwh")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'rm-stamp + (lambda _ + (for-each delete-file (find-files "." "\\.stamp$")))) + (add-after 'rm-stamp 'autoreconf + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))))) + (inputs + `(("gtk+-2" ,gtk+-2) + ("polkit" ,polkit))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("docbook-xsl" ,docbook-xsl) + ("vala" ,vala) + ("autoconf" ,autoconf) + ("automake" ,automake))) + (synopsis "Lightweight X11 session manager") + (description + "Lxsession provides an lightweight X11 session manager.") + (home-page "http://lxde.org") + (license license:gpl2+))) + ;;; lxde.scm ends here diff --git a/gnu/packages/patches/lxsession-use-gapplication.patch b/gnu/packages/patches/lxsession-use-gapplication.patch new file mode 100644 index 000000000..3f2269a42 --- /dev/null +++ b/gnu/packages/patches/lxsession-use-gapplication.patch @@ -0,0 +1,152 @@ +Upstream patch to remove libunique dependency, and use glib >= 2.28.0 +to handle unique apps both for GTK+ 2 and 3. +https://sourceforge.net/p/lxde/patches/539/ + + +From a7d3b40a79a7a16c1f5d50d2bd466570258dae29 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= +Date: Sun, 22 Jan 2017 01:09:59 +0100 +Subject: [PATCH] Use GApplication for unique app handling + +Remove libunique dependency, and use glib >= 2.28.0 to handle unique apps both for GTK+ 2 and 3. +--- + Makefile.am | 6 ------ + configure.ac | 7 +------ + lxclipboard/main.vala | 16 +--------------- + lxpolkit/main.vala | 16 +--------------- + 4 files changed, 3 insertions(+), 42 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index c2e1fe8..e3a3b97 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -90,9 +90,6 @@ if USE_GTK3 + lxclipboard_lxclipboard_VALAFLAGS += --define USE_GTK3 + else + lxclipboard_lxclipboard_VALAFLAGS += --define USE_GTK2 +-lxclipboard_lxclipboard_VALAFLAGS += --pkg unique-1.0 +-lxclipboard_lxclipboard_CPPFLAGS += $(UNIQUE_CFLAGS) +-lxclipboard_lxclipboard_LDADD += $(UNIQUE_LIBS) + endif + + lxpolkit_lxpolkit_vala_SOURCES = \ +@@ -137,9 +134,6 @@ if USE_GTK3 + lxpolkit_lxpolkit_VALAFLAGS += --define USE_GTK3 + else + lxpolkit_lxpolkit_VALAFLAGS += --define USE_GTK2 +-lxpolkit_lxpolkit_VALAFLAGS += --pkg unique-1.0 +-lxpolkit_lxpolkit_CPPFLAGS += $(UNIQUE_CFLAGS) +-lxpolkit_lxpolkit_LDADD += $(UNIQUE_LIBS) + endif + + lxsession_db_lxsession_db_SOURCES = \ +diff --git a/configure.ac b/configure.ac +index 06ddbb3..9126f4d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -45,7 +45,7 @@ PKG_CHECK_MODULES(X11, [x11]) + AC_SUBST(X11_CFLAGS) + AC_SUBST(X11_LIBS) + +-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.6.0]) ++PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.28.0]) + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + +@@ -79,11 +79,6 @@ else + CFLAGS="$CFLAGS -D USE_GTK2" + gtk_modules="gtk+-2.0 >= 2.6.0" + VALA_GTK_LIBS="gtk+-2.0" +- +- PKG_CHECK_MODULES(UNIQUE, [unique-1.0]) +- AC_SUBST(UNIQUE_CFLAGS) +- AC_SUBST(UNIQUE_LIBS) +- + fi + PKG_CHECK_MODULES(GTK, [$gtk_modules]) + AC_SUBST(GTK_CFLAGS) +diff --git a/lxclipboard/main.vala b/lxclipboard/main.vala +index bee4044..3d4a8d7 100644 +--- a/lxclipboard/main.vala ++++ b/lxclipboard/main.vala +@@ -17,9 +17,6 @@ + * MA 02110-1301, USA. + */ + using Gtk; +-#if USE_GTK2 +-using Unique; +-#endif + + namespace Lxsession + { +@@ -28,17 +25,7 @@ namespace Lxsession + public static int main(string[] args) + { + Gtk.init (ref args); +-#if USE_GTK2 +- Unique.App app = new Unique.App("org.lxde.lxclipboard", null); +- +- if(app.is_running) +- { +- message("lxclipboard is already running. Existing"); +- return 0; +- } +-#endif +-# if USE_GTK3 +- Gtk.Application app = new Gtk.Application ( ++ GLib.Application app = new GLib.Application ( + "org.lxde.lxclipboard", + GLib.ApplicationFlags.FLAGS_NONE); + app.register (); +@@ -48,7 +35,6 @@ namespace Lxsession + message("lxclipboard is already running. Existing"); + return 0; + } +-#endif + + clipboard_start (); + +diff --git a/lxpolkit/main.vala b/lxpolkit/main.vala +index c0d6ae2..50c3cb7 100644 +--- a/lxpolkit/main.vala ++++ b/lxpolkit/main.vala +@@ -17,9 +17,6 @@ + * MA 02110-1301, USA. + */ + using Gtk; +-#if USE_GTK2 +-using Unique; +-#endif + + const string GETTEXT_PACKAGE = "lxsession"; + +@@ -33,17 +30,7 @@ namespace Lxsession + Intl.bind_textdomain_codeset(GETTEXT_PACKAGE, "utf-8"); + + Gtk.init (ref args); +-#if USE_GTK2 +- Unique.App app = new Unique.App("org.lxde.lxpolkit", null); +- +- if(app.is_running) +- { +- message(_("lxpolkit is already running. Existing")); +- return 0; +- } +-#endif +-# if USE_GTK3 +- Gtk.Application app = new Gtk.Application ( ++ GLib.Application app = new GLib.Application ( + "org.lxde.lxpolkit", + GLib.ApplicationFlags.FLAGS_NONE); + app.register (); +@@ -53,7 +40,6 @@ namespace Lxsession + message(_("lxpolkit is already running. Existing")); + return 0; + } +-#endif + + policykit_agent_init(); + +-- +2.11.0 + -- cgit v1.3 From dbf544f9ecf9bc9d6edb507dc5ba8ab6ba497f68 Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 23 Jan 2017 17:02:49 +0000 Subject: gnu: Add keybinder. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (keybinder): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/wm.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index b95f2e7a6..d758f264a 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -645,3 +645,32 @@ all of them. Currently supported window managers include: @end enumerate\n") (home-page "http://menumaker.sourceforge.net/") (license license:bsd-2))) + +(define-public keybinder + (package + (name "keybinder") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/engla/keybinder/releases/" + "download/v" version "/keybinder-" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0h52hj3ay8mfhwvmfxbxlfyq74hifdk8wxgxp7fr4iy6189hg7w7")))) + (build-system gnu-build-system) + (inputs + `(("python-2" ,python-2) + ("gtk+-2" ,gtk+-2))) + (native-inputs + `(("python2-pygtk" ,python2-pygtk) + ("gtk-doc" ,gtk-doc) + ("pkg-config" ,pkg-config))) + (synopsis "Library for registering global keyboard shortcuts") + (description + "Keybinder is a library for registering global keyboard shortcuts. +Keybinder works with GTK-based applications using the X Window System.") + (home-page "https://github.com/engla/keybinder") + (license license:gpl2+))) -- cgit v1.3 From 50042505db06b7b8a8708702d0ce6621d8a98f07 Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 23 Jan 2017 17:29:29 +0000 Subject: gnu: Add lxpanel. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxde.scm (lxpanel): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/lxde.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 87f96493c..08fafa237 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -22,11 +22,15 @@ #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages docbook) + #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) + #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) + #:use-module (gnu packages wm) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix build-system gnu) #:use-module (guix download) @@ -354,4 +358,55 @@ in LXDE.") (home-page "http://lxde.org") (license license:gpl2+))) +(define-public lxpanel + (package + (name "lxpanel") + (version "0.9.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://downloads.sourceforge.net/lxde/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1ccgv7jgl3y865cpb6w7baaz7468fxncm83bqxlwyni5bwhglb1l")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (menu (assoc-ref inputs "lxmenu-data"))) + (wrap-program (string-append out "/bin/lxpanel") + `("XDG_DATA_DIRS" ":" prefix + (,(string-append menu "/share")))) + #t)))))) + (inputs + ;; TODO: libindicator-0.3.0 + `(("gtk+-2" ,gtk+-2) + ("alsa-lib" ,alsa-lib) + ("libwnck-2" ,libwnck-2) + ("keybinder" ,keybinder) + ("libxmu" ,libxmu) + ("libxpm" ,libxpm) + ("libxml2" ,libxml2) + ("cairo" ,cairo) + ("libx11" ,libx11) + ("wireless-tools" ,wireless-tools))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("docbook-xml" ,docbook-xml) + ("gettext-minimal" ,gettext-minimal))) + (propagated-inputs + `(("lxmenu-data" ,lxmenu-data) + ("libfm" ,libfm) + ("menu-cache" ,menu-cache))) + (synopsis "X11 Desktop panel for LXDE") + (description + "Lxpanel provides an X11 desktop panel for LXDE.") + (home-page "http://lxde.org") + (license license:gpl2+))) + ;;; lxde.scm ends here -- cgit v1.3 From 812c1819a0ca740d2ab165d691806def2a2d119f Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 23 Jan 2017 17:44:50 +0000 Subject: gnu: Add lxde. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxde.scm (lxde): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/lxde.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 08fafa237..084426371 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -27,12 +27,14 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages linux) + #:use-module (gnu packages openbox) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages wm) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -409,4 +411,41 @@ in LXDE.") (home-page "http://lxde.org") (license license:gpl2+))) +(define-public lxde + (package + (name "lxde") + (version (package-version lxde-common)) + (source #f) + (build-system trivial-build-system) + (arguments '(#:builder (mkdir %output))) + (propagated-inputs + ;; TODO: + ;; lxshortcut, lxsession-edit, gpicview, leafpad, + ;; lxappearance-obconf + `(("menu-cache" ,menu-cache) + ("lxappearance" ,lxappearance) + ("lxde-icon-theme" ,lxde-icon-theme) + ("lxde-common" ,lxde-common) + ("lxmenu-data" ,lxmenu-data) + ("lxpanel" ,lxpanel) + ("lxrandr" ,lxrandr) + ("lxsession" ,lxsession) + ("libfm" ,libfm) + ("libfm-extra" ,libfm-extra) + ("lxtask" ,lxtask) + ("lxterminal" ,lxterminal) + ("pcmanfm" ,pcmanfm) + ("openbox" ,openbox) + ("obconf" ,obconf))) + (synopsis "Lightweight X11 Desktop Environment") + (description + "LXDE, which stands for Lightweight X11 Desktop Environment, is a +desktop environment which is lightweight and fast. It is designed to be +user friendly and slim, while keeping the resource usage low. LXDE uses +less RAM and less CPU while being a feature rich desktop environment. Unlike +other tightly integrated desktops LXDE strives to be modular, so each +component can be used independently with few dependencies.") + (home-page "https://lxde.org") + (license license:gpl2+))) ; And others. + ;;; lxde.scm ends here -- cgit v1.3 From 3ee9355e2fd2d0fcee1076ca1160ba5881b73da8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 29 Mar 2017 02:31:59 +0200 Subject: gnu: python-pexpect: Add verbose test output. Fixes . * gnu/packages/python.scm (python-pexpect, python2-pexpect)[arguments]: Add "-v" to "nosetests" command. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f98933868..4818f86d4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4917,7 +4917,7 @@ cluster without needing to write any wrapper code yourself.") ;; Why does it not work? Delete for now. (delete-file "tests/test_socket.py") #t)) - (replace 'check (lambda _ (zero? (system* "nosetests"))))))) + (replace 'check (lambda _ (zero? (system* "nosetests" "-v"))))))) (native-inputs `(("python-nose" ,python-nose) ("python-pytest" ,python-pytest) -- cgit v1.3 From b125649a5945f54b2af4f2cf8919580d1db07cc6 Mon Sep 17 00:00:00 2001 From: Vasile Dumitrascu Date: Tue, 28 Mar 2017 21:58:42 +0200 Subject: gnu: emacs-monroe: Don't use MELPA archive. * gnu/packages/emacs.scm (emacs-monroe)[version]: Change to 0.3.1. [source]: Use github instead of melpa. Add (file-name). [home-page]: Use HTTPS. Signed-off-by: Marius Bakke --- gnu/packages/emacs.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index fbd5b0805..bf6a84b0a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3427,17 +3427,18 @@ used for reverse direction.") (define-public emacs-monroe (package (name "emacs-monroe") - (version "20170220.540") + (version "0.3.1") (source (origin (method url-fetch) - (uri (string-append "http://melpa.org/packages/monroe-" - version ".el")) + (uri (string-append "https://github.com/sanel/monroe/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "06p0qdhg4arwij1qpiiiwsd0m1bbl1qwd20ij2bmhryrvrcpswq3")))) + "0icdx8shkd951phlnmcq1vqaxp1l667q5rjscskc5r22aylakh4w")))) (build-system emacs-build-system) - (home-page "http://www.github.com/sanel/monroe") + (home-page "https://github.com/sanel/monroe") (synopsis "Clojure nREPL client for Emacs") (description "Monroe is a nREPL client for Emacs, focused on simplicity and easy -- cgit v1.3 From 7bde7273c35cf9dfe3d63fc9c7b6697d06bf92b8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 28 Mar 2017 21:48:09 -0400 Subject: gnu: libressl: Update to 2.5.2. * gnu/packages/tls.scm (libressl): Update to 2.5.2. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 9c7cb0b0c..301a705cf 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -469,7 +469,7 @@ required structures.") (define-public libressl (package (name "libressl") - (version "2.5.1") + (version "2.5.2") (source (origin (method url-fetch) @@ -478,7 +478,7 @@ required structures.") version ".tar.gz")) (sha256 (base32 - "1kc709scgd76vk7fld4jnb4wb5lxdv1cj8zsgyjb33xp4jlf06pp")))) + "10hw434azw0gvfkmfm46r85r7my1c6592rg9jsna914jh1q7vyhg")))) (build-system gnu-build-system) (native-search-paths ;; FIXME: These two variables must designate a single file or directory -- cgit v1.3 From f8279ba46baa5a1ad7e6c32546d71819eff72e4e Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 27 Mar 2017 16:40:17 -0400 Subject: gnu: hyperrogue: Update to 9.4c. * gnu/packages/games.scm (hyperrogue): Update to 9.4c. [source]: Remove snippet. [arguments]: Remove #:make-flags; adjust configure and install phases; add install-data phase. [native-inputs]: Add hyperrogue-data and unzip. [license]: Add cc-by-sa4.0 and cc0 licenses for sounds. --- gnu/packages/games.scm | 104 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 68 insertions(+), 36 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 67fcb7b49..19f9c9d39 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3163,23 +3163,21 @@ throwing people around in pseudo-randomly generated buildings.") (define-public hyperrogue (package (name "hyperrogue") - (version "8.3j") + (version "9.4c") + ;; When updating this package, be sure to update the "hyperrogue-data" + ;; origin in native-inputs. (source (origin (method url-fetch) (uri (string-append "http://www.roguetemple.com/z/hyper/" - name "-83j.zip")) + name (string-join (string-split version #\.) "") + "-src.tgz")) (sha256 (base32 - "1ag95d84m4j0rqyn9hj7655znixw2j57bpf93nk14nfy02xz1g6p")) - (modules '((guix build utils))) - ;; Remove .exe and .dll files. - (snippet - '(for-each delete-file (find-files "." "\\.(exe|dll)$"))))) + "1ri5fllnhqjm3dlnl1xbb9mlv79iigc940vbvcnk0v5k6p58pavq")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no check target - #:make-flags '("-Csrc") + `(#:tests? #f ; no check target #:phases (modify-phases %standard-phases (add-after 'set-paths 'set-sdl-paths @@ -3190,21 +3188,24 @@ throwing people around in pseudo-randomly generated buildings.") ;; Fix font and music paths. (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (dejavu-dir (string-append - (assoc-ref inputs "font-dejavu") - "/share/fonts/truetype")) - (dejavu-font "DejaVuSans-Bold.ttf") - (music-file "hyperrogue-music.txt")) - (with-directory-excursion "src" - (substitute* "graph.cpp" - ((dejavu-font) - (string-append dejavu-dir "/" dejavu-font)) - (((string-append "\\./" music-file)) - (string-append out "/share/hyperrogue/" music-file))) - (substitute* music-file - (("\\*/") - (string-append out "/share/hyperrogue/"))))) + (let* ((out (assoc-ref outputs "out")) + (share-dir (string-append out "/share/hyperrogue")) + (dejavu-dir (string-append + (assoc-ref inputs "font-dejavu") + "/share/fonts/truetype")) + (dejavu-font "DejaVuSans-Bold.ttf") + (music-file "hyperrogue-music.txt")) + (substitute* "graph.cpp" + ((dejavu-font) + (string-append dejavu-dir "/" dejavu-font))) + (substitute* "sound.cpp" + (((string-append "\\./" music-file)) + (string-append share-dir "/" music-file)) + (("sounds/") + (string-append share-dir "/sounds/"))) + (substitute* music-file + (("\\*/") + (string-append share-dir "/sounds/")))) #t)) (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) @@ -3212,14 +3213,43 @@ throwing people around in pseudo-randomly generated buildings.") (bin (string-append out "/bin")) (share-dir (string-append out "/share/hyperrogue"))) (mkdir-p bin) - (copy-file "src/hyper" (string-append bin "/hyperrogue")) - (mkdir-p share-dir) - (copy-file "src/hyperrogue-music.txt" - (string-append share-dir "/hyperrogue-music.txt")) - (for-each (lambda (file) - (copy-file file (string-append share-dir "/" file))) - (find-files "." "\\.ogg$"))) - #t))))) + (copy-file "hyper" (string-append bin "/hyperrogue")) + (install-file "hyperrogue-music.txt" share-dir)) + #t)) + (add-after 'install 'install-data + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((data (assoc-ref inputs "hyperrogue-data")) + (out (assoc-ref outputs "out")) + (sounds (string-append out "/share/hyperrogue/sounds")) + (unzip (string-append (assoc-ref inputs "unzip") "/bin/unzip"))) + (and + ;; Extract media license information into sounds directory. + (zero? + (system* unzip "-j" data + (string-append + "hyperrogue" + (string-join (string-split ,version #\.) "") + "-win/sounds/credits.txt") "-d" sounds)) + ;; Extract sounds and music into sounds directory. + (zero? + (system* "unzip" "-j" data + (string-append + "hyperrogue" + (string-join (string-split ,version #\.) "") + "-win/*.ogg") "-d" sounds))))))))) + (native-inputs + `(("hyperrogue-data" + ,(origin + (method url-fetch) + (uri + (string-append + "http://www.roguetemple.com/z/hyper/" name + (string-join (string-split version #\.) "") + "-win.zip")) + (sha256 + (base32 + "1cyyrsnrixygg3zyz97hpsm6jzwbhydiwk3kl0lm7qjnw2nzkhhh")))) + ("unzip" ,unzip))) (inputs `(("font-dejavu" ,font-dejavu) ("glew" ,glew) @@ -3240,10 +3270,12 @@ are home to particular creatures and may be subject to own rules of \"physics\". While it can use ASCII characters to display the world the classical rogue symbols, the game needs graphics to render the non-euclidean world.") - (license (list license:bsd-3 ; src/glew.c, src/mtrand.* - license:cc-by-sa3.0 ; *.ogg - license:public-domain ; src/direntx.* - license:zlib ; src/savepng.* + (license (list license:bsd-3 ; glew.c, mtrand.* + license:cc-by-sa3.0 ; music + license:cc-by-sa4.0 ; sounds + license:cc0 + license:public-domain ; direntx.*, some sounds + license:zlib ; savepng.* license:gpl2+)))) ; remaining files (define-public kobodeluxe -- cgit v1.3 From a4cdcffb19f38b47bb7e0234c1244edbede35d59 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 29 Mar 2017 13:14:28 +0200 Subject: gnu: lxsession: Build Vala code from source. * gnu/packages/lxde.scm (lxsession)[source](snippet): New field. --- gnu/packages/lxde.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 084426371..e7654053d 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -333,7 +333,20 @@ in LXDE.") (patches (search-patches "lxsession-use-gapplication.patch")) (sha256 (base32 - "1a0zmyywwzdh59nc0l94cir18vhp633z4q2xfhn5zx11ajj45gwh")))) + "1a0zmyywwzdh59nc0l94cir18vhp633z4q2xfhn5zx11ajj45gwh")) + (modules '((guix build utils))) + (snippet + ;; Remove C files generated by Vala so we can build from source. + '(let* ((c->vala + (lambda (file) + (string-append (string-drop-right file 2) + ".vala"))) + (generated-c-file? + (lambda (file stat) + (and (string-suffix? ".c" file) + (file-exists? (c->vala file)))))) + (for-each delete-file + (find-files "." generated-c-file?)))))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.3 From 4caad35dbe11b2f415a251acec15cb48675b073f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 29 Mar 2017 14:17:29 -0400 Subject: gnu: imagemagick: Update to 6.9.8-3. * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.8-3. --- gnu/packages/imagemagick.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 73496ccfc..6423f91f4 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -46,14 +46,14 @@ ;; The 7 release series has an incompatible API, while the 6 series is still ;; maintained. Don't update to 7 until we've made sure that the ImageMagick ;; users are ready for the 7-series API. - (version "6.9.7-10") + (version "6.9.8-3") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "02gvxz1xap5nm1vrgjxhkx13q6ja06vf23n28nc6cfdpb4s2xyqb")))) + "05hk841f5fw1hh7pfmpznlwcdr68ijk3s3zwqv0g009xh17q1max")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch") -- cgit v1.3 From 7086540de6bb37d32db76c118d70fbfe29c85b44 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 29 Mar 2017 14:24:29 -0400 Subject: gnu: elfutils: Update to 0.168 [fixes CVE-2016-{10254,10255}]. * gnu/packages/elf.scm (elfutils): Update to 0.168. [source]: Update URL. [home-page]: Update URL. --- gnu/packages/elf.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 35b644906..c1f8fa362 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2015 Andreas Enge +;;; Copyright © 2017 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,15 +31,14 @@ (define-public elfutils (package (name "elfutils") - (version "0.167") + (version "0.168") (source (origin (method url-fetch) - (uri (string-append - "https://fedorahosted.org/releases/e/l/elfutils/" - version "/elfutils-" version ".tar.bz2")) + (uri (string-append "https://sourceware.org/elfutils/ftp/" + version "/elfutils-" version ".tar.bz2")) (sha256 (base32 - "0lv5fz2h7j9362l5apbg9jff7309ni385d3325ckavrbqj3h0c1z")) + "0xn2fbgda1i703csfs35frvm7l068ybmay4ssrykqdx17f4hg3dq")) (patches (search-patches "elfutils-tests-ptrace.patch")))) (build-system gnu-build-system) @@ -56,7 +56,7 @@ (native-inputs `(("m4" ,m4))) (inputs `(("zlib" ,zlib))) - (home-page "https://fedorahosted.org/elfutils/") + (home-page "https://sourceware.org/elfutils/") (synopsis "Linker and ELF manipulation tools") (description "This package provides command-line tools to manipulate binaries in the -- cgit v1.3 From 8615da90518ca29a6451b76784f7f181a27fc713 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 29 Mar 2017 14:42:24 -0400 Subject: gnu: beets: Don't build with python-enum34. This package is unnecessary when using Python > 3.3. * gnu/packages/music.scm (beets)[inputs]: Remove python-enum34. --- gnu/packages/music.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 2f70945c6..fc384d642 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2114,7 +2114,6 @@ websites such as Libre.fm.") ;; TODO: Install optional plugins and dependencies. (inputs `(("python-discogs-client" ,python-discogs-client) - ("python-enum34" ,python-enum34) ("python-jellyfish" ,python-jellyfish) ("python-munkres" ,python-munkres) ("python-musicbrainzngs" ,python-musicbrainzngs) -- cgit v1.3 From 8d5fe1f1cf2226d245b93d35ca4244c3e61abd88 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 4 Jan 2017 10:42:38 +0100 Subject: gnu: Add httpfs2. * gnu/packages/file-systems.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 2 + gnu/packages/file-systems.scm | 88 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 gnu/packages/file-systems.scm (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 34642af45..063974b75 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -9,6 +9,7 @@ # Copyright © 2016 Adonay "adfeno" Felipe Nogueira # Copyright © 2016, 2017 Ricardo Wurmus # Copyright © 2016 Ben Woodcroft +# Copyright © 2017 Tobias Geerinckx-Rice # Copyright © 2017 Clément Lassieur # Copyright © 2017 Mathieu Othacehe # @@ -129,6 +130,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/fcitx.scm \ %D%/packages/figlet.scm \ %D%/packages/file.scm \ + %D%/packages/file-systems.scm \ %D%/packages/finance.scm \ %D%/packages/firmware.scm \ %D%/packages/flashing-tools.scm \ diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm new file mode 100644 index 000000000..b4134dec8 --- /dev/null +++ b/gnu/packages/file-systems.scm @@ -0,0 +1,88 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages file-systems) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages) + #:use-module (gnu packages documentation) + #:use-module (gnu packages docbook) + #:use-module (gnu packages linux) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages tls) + #:use-module (gnu packages xml)) + +(define-public httpfs2 + (package + (name "httpfs2") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/httpfs/" name "/" + name "-" version ".tar.gz")) + (sha256 + (base32 + "1h8ggvhw30n2r6w11n1s458ypggdqx6ldwd61ma4yd7binrlpjq1")))) + (build-system gnu-build-system) + (native-inputs + `(("asciidoc" ,asciidoc) + ("docbook-xml" ,docbook-xml) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("pkg-config" ,pkg-config))) + (inputs + `(("fuse" ,fuse) + ("gnutls" ,gnutls))) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (replace 'install + ;; There's no ‘install’ target. Install all variants manually. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man1 (string-append out "/share/man/man1"))) + (mkdir-p bin) + (mkdir-p man1) + (for-each + (lambda (variant) + (let ((man1-page (string-append variant ".1"))) + (install-file variant bin) + (install-file man1-page man1))) + (list "httpfs2" + "httpfs2-mt" + "httpfs2-ssl" + "httpfs2-ssl-mt"))) + #t))) + #:make-flags (list "CC=gcc") + #:parallel-build? #f ; can result in missing man pages + #:tests? #f)) ; no tests + (home-page "https://sourceforge.net/projects/httpfs/") + (synopsis "Mount remote files over HTTP") + (description "httpfs2 is a @code{fuse} file system for mounting any +@dfn{HyperText} (HTTP or HTTPS) URL. It uses HTTP/1.1 byte ranges to request +arbitrary bytes from the web server, without needing to download the entire +file. This is particularly useful with large archives such as ZIP files and +ISO images when you only need to inspect their contents or extract specific +files. Since the HTTP protocol itself has no notion of directories, only a +single file can be mounted.") + (license license:gpl2+))) -- cgit v1.3 From a53a6b6fefc5ffc3a9b085ed0c2567928f4d5225 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Mar 2017 17:45:50 +0200 Subject: gnu: hyperrogue: Improve description. * gnu/packages/games.scm (hyperrogue)[description]: Mainly fix a typo. Throw in a few tweaks as well. --- gnu/packages/games.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 19f9c9d39..0dcb15f32 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3266,10 +3266,11 @@ monsters -- rogue-like but for the fact that it is played on the hyperbolic plane and not in euclidean space. In HyperRogue, the player can move through different parts of the world, which -are home to particular creatures and may be subject to own rules of \"physics\". +are home to particular creatures and may be subject to their own rules of +\"physics\". -While it can use ASCII characters to display the world the classical rogue -symbols, the game needs graphics to render the non-euclidean world.") +While the game can use ASCII characters to display the the classical rogue +symbols, it still needs graphics to render the non-euclidean world.") (license (list license:bsd-3 ; glew.c, mtrand.* license:cc-by-sa3.0 ; music license:cc-by-sa4.0 ; sounds -- cgit v1.3 From dbaca6b5072c5954c248050243a0a1ca43c45f19 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Mar 2017 18:34:22 +0200 Subject: gnu: zstd: Update to 1.1.4. * gnu/packages/compression.scm (zstd): Update to 1.1.4. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index aa2e14328..3d685229b 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1178,7 +1178,7 @@ RAR archives.") (define-public zstd (package (name "zstd") - (version "1.1.3") + (version "1.1.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/facebook/zstd/archive/v" @@ -1186,7 +1186,7 @@ RAR archives.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "02mgk7cbyksfx7mq95cykghb7dya797z0n2jxr5fx9j0x0m56v0h")) + "1yxr1y83gphljxaqhwvxbldy1ivx81x93rngiv5l94rmdrc2pbka")) (modules '((guix build utils))) (snippet ;; Remove non-free source files. -- cgit v1.3 From ddce090306023c7cf08eda81545b702f5fc1496d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Mar 2017 18:46:31 +0200 Subject: gnu: games: Use INSTALL-FILE. * gnu/packages/games.scm (glkterm, glulxe): Use INSTALL-FILE, return #t instead of an undefined value, and prefer using let bindings. --- gnu/packages/games.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 0dcb15f32..80c5cc303 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2016 Steve Webber ;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira ;;; Copyright © 2017 Arun Isaac +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -982,14 +983,16 @@ in different ways.") 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (inc (string-append out "/include"))) + (inc (string-append out "/include")) + (lib (string-append out "/lib"))) (mkdir-p inc) (for-each (lambda (file) - (copy-file file (string-append inc "/" file))) + (install-file file inc)) '("glk.h" "glkstart.h" "gi_blorb.h" "gi_dispa.h" "Make.glkterm")) - (mkdir (string-append out "/lib")) - (copy-file "libglkterm.a" (string-append out "/lib/libglkterm.a")))) + (mkdir-p lib) + (install-file "libglkterm.a" lib)) + #t) (alist-delete 'configure %standard-phases)))) (home-page "http://www.eblong.com/zarf/glk/") (synopsis "Curses Implementation of the Glk API") @@ -1026,9 +1029,11 @@ using the curses.h library for screen control.") (alist-replace 'install (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) (mkdir-p bin) - (copy-file "glulxe" (string-append bin "/glulxe")))) + (install-file "glulxe" bin)) + #t) (alist-delete 'configure %standard-phases)))) (home-page "http://www.eblong.com/zarf/glulx/") (synopsis "Interpreter for Glulx VM") -- cgit v1.3 From dbe7095b4641e0a5c2fef53701267fcb00c39e74 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Mar 2017 19:01:20 +0200 Subject: gnu: glkterm: Use @code in description. * gnu/packages/games.scm (glkterm)[description]: Use @code. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 80c5cc303..5e4257a16 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1001,7 +1001,7 @@ in different ways.") primarily designed for interactive fiction, but it should be suitable for many interactive text utilities, particularly those based on a command line. This is an implementation of the Glk library which runs in a terminal window, -using the curses.h library for screen control.") +using the @code{curses.h} library for screen control.") (license (license:fsf-free "file://README")))) (define-public glulxe -- cgit v1.3 From 92bdf777904ab2231977426e21cfce087448c387 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Mar 2017 19:02:34 +0200 Subject: gnu: glulxe: Fix typo. * gnu/packages/games.scm (glulxe)[description]: Fix typo. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5e4257a16..3c41b107e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1041,7 +1041,7 @@ using the @code{curses.h} library for screen control.") "Glulx is a 32-bit portable virtual machine intended for writing and playing interactive fiction. It was designed by Andrew Plotkin to relieve some of the restrictions in the venerable Z-machine format. This is the -reference interpreter, using Glk API.") +reference interpreter, using the Glk API.") (license license:expat))) (define-public fizmo -- cgit v1.3 From 3f1271474252db144c1f1e2ef4e7aead1349eb52 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Mar 2017 19:41:26 +0200 Subject: gnu: games: Use ‘modify-phases’. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/games.scm (pingus, cmatrix, freedink-data, xboing, irrlicht, glkterm, glulx, retroarch)[arguments]: Use ‘modify-phases’ syntax. --- gnu/packages/games.scm | 196 ++++++++++++++++++++++++------------------------- 1 file changed, 98 insertions(+), 98 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 3c41b107e..0071056c4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -468,17 +468,15 @@ fight Morgoth, the Lord of Darkness.") ("libpng" ,libpng) ("boost" ,boost))) (arguments - '(#:tests? #f ;no check target + '(#:tests? #f ; no check target #:phases - (alist-delete - 'configure - (alist-replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "make" "install" - (string-append "PREFIX=" - (assoc-ref outputs "out"))))) - %standard-phases)))) + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (zero? (system* "make" "install" + (string-append "PREFIX=" + (assoc-ref outputs "out"))))))))) (home-page "http://pingus.seul.org/welcome.html") (synopsis "Lemmings clone") (description @@ -525,16 +523,16 @@ a C library, so they can easily be integrated into other programs.") (build-system gnu-build-system) (arguments '(#:phases - (alist-replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - ;; This old `configure' script doesn't support - ;; variables passed as arguments. - (let ((out (assoc-ref outputs "out"))) - (setenv "CONFIG_SHELL" (which "bash")) - (zero? - (system* "./configure" - (string-append "--prefix=" out))))) - %standard-phases))) + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + ;; This old ‘configure’ script doesn't support + ;; variables passed as arguments. + (let ((out (assoc-ref outputs "out"))) + (setenv "CONFIG_SHELL" (which "bash")) + (zero? + (system* "./configure" + (string-append "--prefix=" out))))))))) (inputs `(("ncurses" ,ncurses))) (home-page "http://www.asty.org/cmatrix") (synopsis "Simulate the display from \"The Matrix\"") @@ -608,7 +606,10 @@ To that extent, it also includes a front-end for managing all of your D-Mods.") "04f1aa8gfz30qkgv7chjz5n1s8v5hbqs01h2113cq1ylm3isd5sp")))) (build-system gnu-build-system) (arguments - `(#:phases (alist-delete 'configure (alist-delete 'check %standard-phases)) + `(#:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (delete 'check)) ; no tests #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))))) (home-page "http://www.gnu.org/software/freedink/") (synopsis "Game data for GNU Freedink") @@ -688,29 +689,29 @@ Portable Game Notation.") (arguments `(#:tests? #f #:phases - (alist-replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - - (substitute* "Imakefile" - (("XPMINCLUDE[\t ]*= -I/usr/X11/include/X11") - (string-append "XPMINCLUDE = -I" (assoc-ref %build-inputs "libxpm") - "/include/X11"))) - - (substitute* "Imakefile" - (("XBOING_DIR = \\.") "XBOING_DIR=$(PROJECTROOT)")) - - ;; FIXME: HIGH_SCORE_FILE should be set to somewhere writeable - - (zero? (system* "xmkmf" "-a" - (string-append "-DProjectRoot=" - (assoc-ref outputs "out"))))) - (alist-replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (and - (zero? (system* "make" "install.man")) - (zero? (system* "make" "install")))) - %standard-phases)))) + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + + (substitute* "Imakefile" + (("XPMINCLUDE[\t ]*= -I/usr/X11/include/X11") + (string-append "XPMINCLUDE = -I" + (assoc-ref %build-inputs "libxpm") + "/include/X11"))) + + (substitute* "Imakefile" + (("XBOING_DIR = \\.") "XBOING_DIR=$(PROJECTROOT)")) + + ;; FIXME: HIGH_SCORE_FILE should be set to somewhere writeable + + (zero? (system* "xmkmf" "-a" + (string-append "-DProjectRoot=" + (assoc-ref outputs "out")))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (and + (zero? (system* "make" "install.man")) + (zero? (system* "make" "install")))))))) (inputs `(("libx11" ,libx11) ("libxext" ,libxext) ("libxpm" ,libxpm))) @@ -776,25 +777,25 @@ are primarily in English, however some in other languages are provided.") "0cz4z4dwrv5ypl19ll67wl6jjpy5k6ly4vr042w4br88qq5jhazl")))) (build-system gnu-build-system) (arguments - `(#:phases (alist-cons-after - 'unpack 'fix-build-env - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "Makefile" - (("INSTALL_DIR = /usr/local/lib") - (string-append "INSTALL_DIR = " out "/lib"))) - ;; The Makefile assumes these directories exist. - (mkdir-p (string-append out "/lib")) - (mkdir-p (string-append out "/include")))) - (alist-replace - 'unpack - (lambda* (#:key source #:allow-other-keys) - (and (zero? (system* "unzip" source)) - ;; The actual source is buried a few directories deep. - (chdir (string-append "irrlicht-" ,version "/source/Irrlicht/")))) - ;; No configure script - (alist-delete 'configure %standard-phases))) - #:tests? #f ; no check target + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-build-env + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "Makefile" + (("INSTALL_DIR = /usr/local/lib") + (string-append "INSTALL_DIR = " out "/lib"))) + ;; The Makefile assumes these directories exist. + (mkdir-p (string-append out "/lib")) + (mkdir-p (string-append out "/include"))))) + (replace 'unpack + (lambda* (#:key source #:allow-other-keys) + (and (zero? (system* "unzip" source)) + ;; The actual source is buried a few directories deep. + (chdir (string-append "irrlicht-" ,version + "/source/Irrlicht/"))))) + (delete 'configure)) ; no configure script + #:tests? #f ; no check target #:make-flags '("CC=gcc" "sharedlib"))) (native-inputs `(("unzip" ,unzip))) @@ -979,21 +980,21 @@ in different ways.") (arguments '(#:tests? #f ; no check target #:phases - (alist-replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (inc (string-append out "/include")) - (lib (string-append out "/lib"))) - (mkdir-p inc) - (for-each - (lambda (file) - (install-file file inc)) - '("glk.h" "glkstart.h" "gi_blorb.h" "gi_dispa.h" "Make.glkterm")) - (mkdir-p lib) - (install-file "libglkterm.a" lib)) - #t) - (alist-delete 'configure %standard-phases)))) + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (inc (string-append out "/include")) + (lib (string-append out "/lib"))) + (mkdir-p inc) + (for-each + (lambda (file) + (install-file file inc)) + '("glk.h" "glkstart.h" "gi_blorb.h" "gi_dispa.h" "Make.glkterm")) + (mkdir-p lib) + (install-file "libglkterm.a" lib)) + #t)) + (delete 'configure)))) ; no configure script (home-page "http://www.eblong.com/zarf/glk/") (synopsis "Curses Implementation of the Glk API") (description @@ -1019,22 +1020,22 @@ using the @code{curses.h} library for screen control.") (build-system gnu-build-system) (inputs `(("glk" ,glkterm))) (arguments - '(#:tests? #f ; no check target + '(#:tests? #f ; no check target #:make-flags (let* ((glk (assoc-ref %build-inputs "glk"))) (list (string-append "GLKINCLUDEDIR=" glk "/include") (string-append "GLKLIBDIR=" glk "/lib") (string-append "GLKMAKEFILE=" "Make.glkterm"))) #:phases - (alist-replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (mkdir-p bin) - (install-file "glulxe" bin)) - #t) - (alist-delete 'configure %standard-phases)))) + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (mkdir-p bin) + (install-file "glulxe" bin)) + #t)) + (delete 'configure)))) ; no configure script (home-page "http://www.eblong.com/zarf/glulx/") (synopsis "Interpreter for Glulx VM") (description @@ -1097,16 +1098,15 @@ either by Infocom or created using the Inform compiler.") (arguments '(#:tests? #f ; no tests #:phases - (alist-replace - 'configure - (lambda _ - (substitute* "qb/qb.libs.sh" - (("/bin/true") (which "true"))) - (zero? (system* - "./configure" - (string-append "--prefix=" %output) - (string-append "--global-config-dir=" %output "/etc")))) - %standard-phases))) + (modify-phases %standard-phases + (replace 'configure + (lambda _ + (substitute* "qb/qb.libs.sh" + (("/bin/true") (which "true"))) + (zero? (system* + "./configure" + (string-append "--prefix=" %output) + (string-append "--global-config-dir=" %output "/etc")))))))) (inputs `(("alsa-lib" ,alsa-lib) ("ffmpeg" ,ffmpeg) -- cgit v1.3 From 05e0ac46ef0118b92f6d9002a2c4333c22c89423 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Mar 2017 20:13:30 +0200 Subject: gnu: retroarch: Don't use %OUTPUT. * gnu/packages/games.scm (retroarch)[arguments]: Accept an OUTPUTS key in the configure phase. Add a comment about the script. Use LET*. --- gnu/packages/games.scm | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 0071056c4..b4498c6a3 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1096,17 +1096,21 @@ either by Infocom or created using the Inform compiler.") (base32 "1xar0wagcz50clwwkvjg4zq9m1sjqw47vw3xx44pisdj94g21m5y")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no tests + '(#:tests? #f ; no tests #:phases (modify-phases %standard-phases (replace 'configure - (lambda _ - (substitute* "qb/qb.libs.sh" - (("/bin/true") (which "true"))) - (zero? (system* - "./configure" - (string-append "--prefix=" %output) - (string-append "--global-config-dir=" %output "/etc")))))))) + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (etc (string-append out "/etc"))) + (substitute* "qb/qb.libs.sh" + (("/bin/true") (which "true"))) + ;; The configure script does not yet accept the extra arguments + ;; (like ‘CONFIG_SHELL=’) passed by the default configure phase. + (zero? (system* + "./configure" + (string-append "--prefix=" out) + (string-append "--global-config-dir=" etc))))))))) (inputs `(("alsa-lib" ,alsa-lib) ("ffmpeg" ,ffmpeg) -- cgit v1.3 From a29d329fa8148f065eec62116b1e42fffef471f0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Mar 2017 21:09:51 +0200 Subject: gnu: games: Don't MKDIR before INSTALL-FILE. * gnu/packages/games.scm (glkterm, glulxe, grue-hunter)[arguments]: Remove spurious MKDIRs. --- gnu/packages/games.scm | 5 ----- 1 file changed, 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b4498c6a3..bb0f85360 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -986,12 +986,10 @@ in different ways.") (let* ((out (assoc-ref outputs "out")) (inc (string-append out "/include")) (lib (string-append out "/lib"))) - (mkdir-p inc) (for-each (lambda (file) (install-file file inc)) '("glk.h" "glkstart.h" "gi_blorb.h" "gi_dispa.h" "Make.glkterm")) - (mkdir-p lib) (install-file "libglkterm.a" lib)) #t)) (delete 'configure)))) ; no configure script @@ -1032,7 +1030,6 @@ using the @code{curses.h} library for screen control.") (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin"))) - (mkdir-p bin) (install-file "glulxe" bin)) #t)) (delete 'configure)))) ; no configure script @@ -2661,7 +2658,6 @@ Super Game Boy, BS-X Satellaview, and Sufami Turbo.") (doc (string-append out "/share/doc/grue-hunter"))) (begin - (mkdir out) (copy-file tarball "grue-hunter.tar.gz") (zero? (system* gzip "-d" "grue-hunter.tar.gz")) (zero? (system* tar "xvf" "grue-hunter.tar")) @@ -2672,7 +2668,6 @@ Super Game Boy, BS-X Satellaview, and Sufami Turbo.") (patch-shebang (string-append bin "/grue-hunter") (list perl)) - (mkdir-p doc) (install-file "grue-hunter/AGPLv3.txt" doc)))))) (inputs `(("perl" ,perl) ("tar" ,tar) -- cgit v1.3 From 9342c5a0bcde8ff16268e86f51a8063d70fe7ab1 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 29 Mar 2017 16:20:10 -0400 Subject: gnu: schismtracker: Update to 20160913. * gnu/packages/music.scm (schismtracker): Update to 20160913. [source]: Update snippet for version 20160913. --- gnu/packages/music.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index fc384d642..c7612f89a 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2161,7 +2161,7 @@ for improved Amiga ProTracker 2/3 compatibility.") (define-public schismtracker (package (name "schismtracker") - (version "20160521") + (version "20160913") (source (origin (method url-fetch) (uri (string-append @@ -2170,12 +2170,12 @@ for improved Amiga ProTracker 2/3 compatibility.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0c6r24wm3rldm4j8cskl9xnixj3rwi3lnrhckw5gv43wpy6h4jcz")) + "1sc813qi4gl6mf7xp8rrarvyigzhxv3qdrryqsy42yxsb2jcwbrw")) (modules '((guix build utils))) (snippet ;; Remove use of __DATE__ and __TIME__ for reproducibility. `(substitute* "schism/version.c" - (("Schism Tracker build %s %s.*$") + (("Schism Tracker built %s %s.*$") (string-append "Schism Tracker version " ,version "\");")))))) (build-system gnu-build-system) (arguments -- cgit v1.3 From 5e923414715e7bc2e8a0e8a12c30ba2dcff0513a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 29 Mar 2017 14:41:26 -0400 Subject: gnu: python-enum34: Update to 1.1.6. * gnu/packages/python.scm (python-enum34, python2-enum34): Update to 1.1.6. [arguments]: Remove custom test phase. --- gnu/packages/python.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4818f86d4..7dfe4babb 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1461,21 +1461,15 @@ bug tracker.") (define-public python-enum34 (package (name "python-enum34") - (version "1.1.0") + (version "1.1.6") (source (origin (method url-fetch) (uri (pypi-uri "enum34" version)) (sha256 (base32 - "0yx1m4564wxgbm4glb3457hi16xihd9w63rv13y2przkdir9dfgp")))) + "1cgm5ng2gcfrkrm3hc22brl6chdmv67b9zvva9sfs7gn7dwc9n4a")))) (build-system python-build-system) - (arguments - `(#:phases - (alist-replace - 'check - (lambda _ (zero? (system* "python" "enum/test_enum.py"))) - %standard-phases))) (home-page "https://pypi.python.org/pypi/enum34") (synopsis "Backported Python 3.4 Enum") (description -- cgit v1.3 From 2abf6371ccee6d52eafbda1b4bdb80df8fdbe4f0 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 29 Mar 2017 06:56:51 -0400 Subject: gnu: icecat: Add fixes from mozilla-esr45; use skia by default. * gnu/packages/gnuzilla.scm (icecat)[source][patches]: Add fixes from the upstream mozilla-esr45 repository. [arguments]: Add 'use-skia-by-default' phase. --- gnu/packages/gnuzilla.scm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 8d9f781a4..4a5f27a2a 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -354,7 +354,20 @@ standards.") (mozilla-patch "icecat-bug-1343261.patch" "9b5374019b58" "0v5w50r5ys4jjy1lpks280cq8paw7wdy9mrk7szzq7nlcxz90is7") (mozilla-patch "icecat-bug-1343552-pt1.patch" "08bc7a3330e4" "1hsvffscqc4zflni866ilylgi3a13wz0n882z85xplbhwhc9lcfj") (mozilla-patch "icecat-bug-1343552-pt2.patch" "8c61ebe37f1b" "1fjsr6bzfyd1zqzz2pglwh2ckys95h21wy3j4rlwkz66057z53qq") - (mozilla-patch "icecat-bug-1340718.patch" "bfa75fc20c2b" "08gksd06lwbb5ykdrk9gh2cb9bximwxhbxl3rprz64jj2bnmd3dq"))) + (mozilla-patch "icecat-bug-1340718.patch" "bfa75fc20c2b" "08gksd06lwbb5ykdrk9gh2cb9bximwxhbxl3rprz64jj2bnmd3dq") + (mozilla-patch "icecat-bug-1345461.patch" "bcd5e51251dd" "1ms2ad8j04lz761cvdwi9rj5qv3qbjmg0zwyp3fykcf01a323ygd") + (mozilla-patch "icecat-bug-1343505.patch" "290f10412f92" "1dsj22fkz60zfa6isnxj54clg32dwzapwh5f1vz6jsin9r67ik2p") + (mozilla-patch "icecat-bug-1346648.patch" "9369ede30cc1" "1wrdn2aixbzifz7wyqnfi65gaiva8i746pi53z6w62lmn1hwd3ji") + (mozilla-patch "icecat-bug-1347979.patch" "4ae2261bfab0" "1yi3jicwjy7w8f0sv5di4rx05bfpkhcwj3r6dhl5315yz4ifqy30") + (mozilla-patch "icecat-bug-1343795.patch" "dcf468969700" "0syfq35s2r86ajmnqsxlfanvxd9ax57qkfmxpkvmk447s3mxsk08") + (mozilla-patch "icecat-bug-1347168.patch" "5a6390274b64" "1lg5px4sncalh82y61ni9rlg50d83jmmrrvn0944x4zfrzlfaz8x") + (mozilla-patch "icecat-bug-1341096.patch" "64158495e5ae" "1lyh8m159hhzrxj5hr0yib2sb8rkd20qxpykrf398v18s3yc08cx") + (mozilla-patch "icecat-bug-1346654.patch" "f359ec604627" "0j6rzbnzlz8x9sj2r79d1zr4p89c5zq7y49xa4kn6am5ay3ws0ri") + (mozilla-patch "icecat-bug-1344461.patch" "6f14d2ef7981" "0n24hqvjj7vxqdvxhk38swnmvcv7h7vvn5invbidhv22m0qqzs2c") + (mozilla-patch "icecat-bug-1292534.patch" "c709d4b36145" "18cdck3fr4a1ygszb6qk07g6fi3kv6i697pjfcipvqrk358qb0hq") + (mozilla-patch "icecat-bug-1336830.patch" "18e355831dd5" "042487xhq9zkky3pxiqy1rpy69z0j20w0jnl7kwg2j1bzfbnniip") + (mozilla-patch "icecat-bug-1336832.patch" "ebeb0b45a84b" "17ch2aqsrnkiwbnkf6x7a1cpi8jgfjhwr6wp0bsa89s8v1dax6w4") + (mozilla-patch "icecat-bug-1349946.patch" "ccbecbe17a45" "19vwmhvqarpzai8mcq6i7szkrp1h9m8v5lyimkmmdlmagrivjw7f"))) (modules '((guix build utils))) (snippet '(begin @@ -536,6 +549,19 @@ standards.") (substitute* "dom/media/gstreamer/GStreamerFormatHelper.cpp" (("^ \"h264parse\",\n") "")) #t)) + (add-after + 'unpack 'use-skia-by-default + (lambda _ + ;; Use the bundled Skia library by default, since IceCat appears + ;; to be far more stable when using it than when using our system + ;; Cairo. + (let ((out (open "browser/app/profile/icecat.js" + (logior O_WRONLY O_APPEND)))) + (format out "~%// Use Skia by default~%") + (format out "pref(~s, ~s);~%" "gfx.canvas.azure.backends" "skia") + (format out "pref(~s, ~s);~%" "gfx.content.azure.backends" "skia") + (close-port out)) + #t)) (add-after 'unpack 'arrange-to-link-libxul-with-libraries-it-might-dlopen (lambda _ -- cgit v1.3 From c219997a146dc7a955d4f58d36afab2aa926f49c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 30 Mar 2017 00:57:13 +0200 Subject: gnu: orc: Update home page. * gnu/packages/gstreamer.scm (orc)[home-page]: Update. --- gnu/packages/gstreamer.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 5a1cf5333..b3a2d575a 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -85,7 +85,7 @@ "testsuite/exec_opcodes_sys.c") (("if \\(error\\) return 1;") "if (error) return 77;"))))))) - (home-page "http://code.entropywave.com/orc/") + (home-page "http://gstreamer.freedesktop.org/modules/orc.html") (synopsis "Oil runtime compiler") (description "Orc is a just-in-time compiler implemented as a library and set of -- cgit v1.3 From 6fd52309b8f52c9bb59fccffac53e029ce94b698 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 30 Mar 2017 00:48:16 +0200 Subject: gnu: Use HTTPS for almost all gnu.org HOME-PAGEs. All HTTP gnu.org (and supported subdomain) HOME-PAGEs changed to HTTPS. --- gnu/packages/admin.scm | 10 +++++----- gnu/packages/adns.scm | 2 +- gnu/packages/aidc.scm | 2 +- gnu/packages/algebra.scm | 2 +- gnu/packages/assembly.scm | 2 +- gnu/packages/astronomy.scm | 2 +- gnu/packages/autotools.scm | 6 +++--- gnu/packages/base.scm | 26 +++++++++++++------------- gnu/packages/bash.scm | 2 +- gnu/packages/bison.scm | 2 +- gnu/packages/cdrom.scm | 4 ++-- gnu/packages/code.scm | 6 +++--- gnu/packages/commencement.scm | 2 +- gnu/packages/compression.scm | 4 ++-- gnu/packages/cppi.scm | 2 +- gnu/packages/databases.scm | 4 ++-- gnu/packages/dico.scm | 2 +- gnu/packages/dictionaries.scm | 2 +- gnu/packages/ed.scm | 2 +- gnu/packages/emacs.scm | 6 +++--- gnu/packages/fonts.scm | 2 +- gnu/packages/games.scm | 18 +++++++++--------- gnu/packages/gawk.scm | 2 +- gnu/packages/gcal.scm | 2 +- gnu/packages/gcc.scm | 4 ++-- gnu/packages/gettext.scm | 2 +- gnu/packages/ghostscript.scm | 4 ++-- gnu/packages/gnu-doc.scm | 2 +- gnu/packages/gnu-pw-mgr.scm | 2 +- gnu/packages/gnunet.scm | 2 +- gnu/packages/gnuzilla.scm | 2 +- gnu/packages/gperf.scm | 2 +- gnu/packages/groff.scm | 2 +- gnu/packages/gsasl.scm | 4 ++-- gnu/packages/gtk.scm | 2 +- gnu/packages/guile.scm | 6 +++--- gnu/packages/gv.scm | 2 +- gnu/packages/gxmessage.scm | 2 +- gnu/packages/hurd.scm | 6 +++--- gnu/packages/idutils.scm | 2 +- gnu/packages/indent.scm | 2 +- gnu/packages/kerberos.scm | 2 +- gnu/packages/libidn.scm | 2 +- gnu/packages/libsigsegv.scm | 2 +- gnu/packages/libunistring.scm | 2 +- gnu/packages/linux.scm | 4 ++-- gnu/packages/lisp.scm | 2 +- gnu/packages/m4.scm | 2 +- gnu/packages/mail.scm | 2 +- gnu/packages/make-bootstrap.scm | 2 +- gnu/packages/man.scm | 2 +- gnu/packages/marst.scm | 2 +- gnu/packages/maths.scm | 16 ++++++++-------- gnu/packages/messaging.scm | 2 +- gnu/packages/music.scm | 2 +- gnu/packages/ncurses.scm | 2 +- gnu/packages/networking.scm | 2 +- gnu/packages/ocr.scm | 2 +- gnu/packages/package-management.scm | 2 +- gnu/packages/pem.scm | 2 +- gnu/packages/popt.scm | 2 +- gnu/packages/pretty-print.scm | 8 ++++---- gnu/packages/pth.scm | 2 +- gnu/packages/readline.scm | 2 +- gnu/packages/rush.scm | 2 +- gnu/packages/scheme.scm | 2 +- gnu/packages/sdl.scm | 2 +- gnu/packages/search.scm | 2 +- gnu/packages/serveez.scm | 2 +- gnu/packages/statistics.scm | 2 +- gnu/packages/telephony.scm | 10 +++++----- gnu/packages/tex.scm | 2 +- gnu/packages/texinfo.scm | 2 +- gnu/packages/time.scm | 2 +- gnu/packages/tls.scm | 2 +- gnu/packages/unrtf.scm | 2 +- gnu/packages/uucp.scm | 2 +- gnu/packages/version-control.scm | 4 ++-- gnu/packages/xnee.scm | 2 +- 79 files changed, 135 insertions(+), 135 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 4197f6398..9dd664ef6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -232,7 +232,7 @@ application (for console or X terminals) and requires ncurses.") (("\"/bin/sh\"") (string-append "\"" bash "/bin/sh\""))) #t)))))) - (home-page "http://www.gnu.org/software/pies/") + (home-page "https://www.gnu.org/software/pies/") (synopsis "Program invocation and execution supervisor") (description "GNU pies is a program that supervises the invocation and execution of @@ -261,7 +261,7 @@ re-executing them as necessary.") (inputs `(("ncurses" ,ncurses) ("readline" ,readline))) ;for 'ftp' (native-inputs `(("netstat" ,net-tools))) ;for tests - (home-page "http://www.gnu.org/software/inetutils/") + (home-page "https://www.gnu.org/software/inetutils/") (synopsis "Basic networking utilities") (description "Inetutils is a collection of common network programs, such as an ftp @@ -462,7 +462,7 @@ would need and has several interesting built-in capabilities.") (arguments '(#:configure-flags '("alive_cv_nice_ping=yes"))) (inputs `(("guile" ,guile-2.0) ("inetutils" ,inetutils))) - (home-page "http://www.gnu.org/software/alive/") + (home-page "https://www.gnu.org/software/alive/") (synopsis "Autologin and keep-alive daemon") (description "GNU Alive sends periodic pings to a server, generally to keep a @@ -780,7 +780,7 @@ over ssh connections.") (zero? (system* "make" "install-info"))))))) (native-inputs `(("texinfo" ,texinfo) ("util-linux" ,util-linux))) ; for 'cal' - (home-page "http://www.gnu.org/software/rottlog/") + (home-page "https://www.gnu.org/software/rottlog/") (synopsis "Log rotation and management") (description "GNU Rot[t]log is a program for managing log files. It is used to @@ -1214,7 +1214,7 @@ environment variable is set and output is to tty.") #t)) %standard-phases))) - (home-page "http://www.gnu.org/software/direvent/") + (home-page "https://www.gnu.org/software/direvent/") (synopsis "Daemon to monitor directories for events such as file removal") (description "A daemon that monitors directories for events, such as creating, diff --git a/gnu/packages/adns.scm b/gnu/packages/adns.scm index 29d3fa26e..eece884e5 100644 --- a/gnu/packages/adns.scm +++ b/gnu/packages/adns.scm @@ -47,7 +47,7 @@ ;; XXX: Tests expect real name resolution to work. #:tests? #f)) - (home-page "http://www.gnu.org/software/adns/") + (home-page "https://www.gnu.org/software/adns/") (synopsis "Asynchronous DNS client library and utilities") (description "GNU adns is a C library that provides easy-to-use DNS resolution diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index 32093265a..0864aa649 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -45,7 +45,7 @@ from text strings. It supports a variety of encoding standards and sizing measurements. Barcodes can be output in PostScript or Encapsulated PostScript formats.") (license license:gpl3+) - (home-page "http://www.gnu.org/software/barcode/"))) + (home-page "https://www.gnu.org/software/barcode/"))) (define-public qrencode (package diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 7a84332dd..98bb2aeb7 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -495,7 +495,7 @@ binary.") (string-append "--mandir=" out "/share/man") (string-append "--infodir=" out "/share/info"))))) %standard-phases))) - (home-page "http://www.gnu.org/software/bc/") + (home-page "https://www.gnu.org/software/bc/") (synopsis "Arbitrary precision numeric processing language") (description "bc is an arbitrary precision numeric processing language. It includes diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index fbc5cdd16..3f77dd756 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -119,5 +119,5 @@ debugging information in STABS, DWARF 2, and CodeView 8 formats.") run-time. Thus, it is useful in creating Just-In-Time compilers. It abstracts over the target CPU by exposing a standardized RISC instruction set to the clients.") - (home-page "http://www.gnu.org/software/lightning/") + (home-page "https://www.gnu.org/software/lightning/") (license license:gpl3+))) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 9f5e4aeb7..6984f1074 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -108,7 +108,7 @@ systems in a FITS image header.") ("libjpeg" ,libjpeg-8) ("wcslib" ,wcslib))) (build-system gnu-build-system) - (home-page "https://www.gnu.org/software/gnuastro") + (home-page "https://www.gnu.org/software/gnuastro/") (synopsis "Astronomical data manipulation programs") (description "The GNU Astronomy Utilities (Gnuastro) is a suite of programs for the manipulation and analysis of astronomical data.") diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 72d84b51b..1652f3744 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -173,7 +173,7 @@ exec ~a --no-auto-compile \"$0\" \"$@\" (base32 "0rfpapadka2023qhy8294ca5awxpb8d4904js6kv7piby5ax8siq")))) (build-system gnu-build-system) - (home-page "https://www.gnu.org/software/autoconf-archive") + (home-page "https://www.gnu.org/software/autoconf-archive/") (synopsis "Collection of freely reusable Autoconf macros") (description "Autoconf Archive is a collection of over 450 new macros for Autoconf, @@ -275,7 +275,7 @@ output is indexed in many ways to simplify browsing.") args))))) (find-files dir ".*")))) %standard-phases)))) - (home-page "http://www.gnu.org/software/automake/") + (home-page "https://www.gnu.org/software/automake/") (synopsis "Making GNU standards-compliant Makefiles") (description "Automake the part of the GNU build system for producing @@ -334,7 +334,7 @@ Makefile, simplifying the entire process for the developer.") presenting a single consistent, portable interface that hides the usual complexity of working with shared libraries across platforms.") (license gpl3+) - (home-page "http://www.gnu.org/software/libtool/"))) + (home-page "https://www.gnu.org/software/libtool/"))) (define-public libltdl ;; This is a libltdl package separate from the libtool package. This is diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index c75e03828..99509189a 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -72,7 +72,7 @@ "GNU Hello prints the message \"Hello, world!\" and then exits. It serves as an example of standard GNU coding practices. As such, it supports command-line arguments, multiple languages, and so on.") - (home-page "http://www.gnu.org/software/hello/") + (home-page "https://www.gnu.org/software/hello/") (license gpl3+))) (define-public grep @@ -113,7 +113,7 @@ however the output can be greatly customized to include, for example, line numbers. GNU grep offers many extensions over the standard utility, including, for example, recursive directory searching.") (license gpl3+) - (home-page "http://www.gnu.org/software/grep/"))) + (home-page "https://www.gnu.org/software/grep/"))) (define-public sed (package @@ -149,7 +149,7 @@ editing commands to the stream and prints its output to standard output. It is often used for substituting text patterns in a stream. The GNU implementation offers several extensions over the standard utility.") (license gpl3+) - (home-page "http://www.gnu.org/software/sed/"))) + (home-page "https://www.gnu.org/software/sed/"))) (define-public tar (package @@ -191,7 +191,7 @@ directory structure and file information such as permissions and creation/modification dates. GNU tar offers many extensions over the standard utility.") (license gpl3+) - (home-page "http://www.gnu.org/software/tar/"))) + (home-page "https://www.gnu.org/software/tar/"))) (define-public patch (package @@ -215,7 +215,7 @@ files depending on the contents of the diff file. It accepts several different diff formats. It may also be used to revert previously applied differences.") (license gpl3+) - (home-page "http://savannah.gnu.org/projects/patch/"))) + (home-page "https://savannah.gnu.org/projects/patch/"))) (define-public diffutils (package @@ -237,7 +237,7 @@ differ, while \"cmp\" shows the offsets and line numbers where they differ. \"diff3\" allows you to compare three files. Finally, \"sdiff\" offers an interactive means to merge two files.") (license gpl3+) - (home-page "http://www.gnu.org/software/diffutils/"))) + (home-page "https://www.gnu.org/software/diffutils/"))) (define-public findutils (package @@ -272,7 +272,7 @@ recursively searches for files in a directory according to given criteria and are included: \"updatedb\" updates the file name database and \"xargs\" may be used to apply commands with arbitrarily long arguments.") (license gpl3+) - (home-page "http://www.gnu.org/software/findutils/"))) + (home-page "https://www.gnu.org/software/findutils/"))) (define-public coreutils (package @@ -327,7 +327,7 @@ expected in a POSIX system. These provide the basic file, shell and text manipulation functions of the GNU system. Most of these tools offer extended functionality beyond that which is outlined in the POSIX standard.") (license gpl3+) - (home-page "http://www.gnu.org/software/coreutils/"))) + (home-page "https://www.gnu.org/software/coreutils/"))) (define-public coreutils-minimal ;; Coreutils without its optional dependencies. @@ -373,7 +373,7 @@ generated from its source. It has powerful dependency resolution and the ability to determine when files have to be regenerated after their sources change. GNU make offers many powerful extensions over the standard utility.") (license gpl3+) - (home-page "http://www.gnu.org/software/make/"))) + (home-page "https://www.gnu.org/software/make/"))) (define-public binutils (package @@ -421,7 +421,7 @@ the strings in a binary file, and utilities for working with archives. The \"bfd\" library for working with executable and object formats is also included.") (license gpl3+) - (home-page "http://www.gnu.org/software/binutils/"))) + (home-page "https://www.gnu.org/software/binutils/"))) (define* (make-ld-wrapper name #:key (target (const #f)) @@ -493,7 +493,7 @@ wrapper for the cross-linker for that target, called 'TARGET-ld'." "The linker wrapper (or 'ld-wrapper') wraps the linker to add any missing '-rpath' flags, and to detect any misuse of libraries outside of the store.") - (home-page "http://www.gnu.org/software/guix/") + (home-page "https://www.gnu.org/software/guix//") (license gpl3+))) (export make-ld-wrapper) @@ -673,7 +673,7 @@ printf, exit... The GNU C library is used as the C library in the GNU system and most systems with the Linux kernel.") (license lgpl2.0+) - (home-page "http://www.gnu.org/software/libc/"))) + (home-page "https://www.gnu.org/software/libc/"))) (define-public glibc/hurd ;; The Hurd's libc variant. @@ -1033,7 +1033,7 @@ and daylight-saving rules.") "libiconv provides an implementation of the iconv function for systems that lack it. iconv is used to convert between character encodings in a program. It supports a wide variety of different encodings.") - (home-page "http://www.gnu.org/software/libiconv/") + (home-page "https://www.gnu.org/software/libiconv/") (license lgpl3+))) (define* (libiconv-if-needed #:optional (target (%current-target-system))) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 388f5271c..0a3491c82 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -180,7 +180,7 @@ allows command-line editing, unlimited command history, shell functions and aliases, and job control while still allowing most sh scripts to be run without modification.") (license gpl3+) - (home-page "http://www.gnu.org/software/bash/")))) + (home-page "https://www.gnu.org/software/bash/")))) (define-public bash-minimal ;; A stripped-down Bash for non-interactive use. diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index 178a99d4e..09c6481a1 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -44,7 +44,7 @@ ("m4" ,m4))) (inputs `(("flex" ,flex))) (propagated-inputs `(("m4" ,m4))) - (home-page "http://www.gnu.org/software/bison/") + (home-page "https://www.gnu.org/software/bison/") (synopsis "Parser generator") (description "GNU Bison is a general-purpose parser generator. It can build a diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 14e430646..7e86753ab 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -127,7 +127,7 @@ extraction from CDs.") (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs `(("libcdio" ,libcdio))) - (home-page "http://www.gnu.org/software/libcdio/") + (home-page "https://www.gnu.org/software/libcdio/") (synopsis "Jitter- and error-tolerant CD audio extraction") (description "libcdio-paranoia is an implementation of CD paranoia libraries based on @@ -519,5 +519,5 @@ the conversion of the proprietary CCD format to the CUE format, which is well-supported by free software. These files are commonly distributed with CD images and are used to describe how tracks are laid out on the image.") - (home-page "http://www.gnu.org/software/ccd2cue") + (home-page "https://www.gnu.org/software/ccd2cue/") (license gpl3+))) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 3aaa754c0..d57fc004c 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -57,7 +57,7 @@ ;; Needed to have cflow-mode.el installed. (native-inputs `(("emacs" ,emacs-minimal))) - (home-page "http://www.gnu.org/software/cflow/") + (home-page "https://www.gnu.org/software/cflow/") (synopsis "Create a graph of control flow within a program") (description "GNU cflow analyzes C source files and produces a graph charting the @@ -81,7 +81,7 @@ a major mode for Emacs for examining the flowcharts that it produces.") (native-inputs `(("texinfo" ,texinfo) ("autogen" ,autogen))) - (home-page "http://www.gnu.org/software/complexity/") + (home-page "https://www.gnu.org/software/complexity/") (synopsis "Analyze complexity of C functions") (description "GNU complexity provides tools for finding procedures that are @@ -123,7 +123,7 @@ highlighting your own code that seemed comprehensible when you wrote it.") (install-file (string-append data "/gtags.el") lisp) (delete-file (string-append data "/gtags.el")) #t)))))) - (home-page "http://www.gnu.org/software/global/") + (home-page "https://www.gnu.org/software/global/") (synopsis "Cross-environment source code tag system") (description "GLOBAL is a source code tagging system that functions in the same way diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 7df1d3fca..c22f67ac1 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -971,7 +971,7 @@ COREUTILS-FINAL vs. COREUTILS, etc." "This package provides a complete GCC tool chain for C/C++ development to be installed in user profiles. This includes GCC, as well as libc (headers and binaries, plus debugging symbols in the 'debug' output), and Binutils.") - (home-page "http://gcc.gnu.org/") + (home-page "https://gcc.gnu.org/") (outputs '("out" "debug")) ;; The main raison d'être of this "meta-package" is (1) to conveniently diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 3d685229b..132e8d68e 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -204,7 +204,7 @@ typical extension is \".gz\". Unlike the \"zip\" format, it compresses a single file; as a result, it is often used in conjunction with \"tar\", resulting in \".tar.gz\" or \".tgz\", etc.") (license license:gpl3+) - (home-page "http://www.gnu.org/software/gzip/"))) + (home-page "https://www.gnu.org/software/gzip/"))) (define-public bzip2 (let ((build-shared-lib @@ -500,7 +500,7 @@ archiving. Lzip is a clean implementation of the LZMA algorithm.") (substitute* "tests/shar-1.ok" (((which "sh")) "/bin/sh"))) %standard-phases))) - (home-page "http://www.gnu.org/software/sharutils/") + (home-page "https://www.gnu.org/software/sharutils/") (synopsis "Archives in shell scripts, uuencode/uudecode") (description "GNU sharutils is a package for creating and manipulating shell diff --git a/gnu/packages/cppi.scm b/gnu/packages/cppi.scm index fc117162b..39d310394 100644 --- a/gnu/packages/cppi.scm +++ b/gnu/packages/cppi.scm @@ -34,7 +34,7 @@ (base32 "1jk42cjaggk71rimjnx3qpmb6hivps0917vl3z7wbxk3i2whb98j")))) (build-system gnu-build-system) - (home-page "http://www.gnu.org/software/cppi/") + (home-page "https://www.gnu.org/software/cppi/") (synopsis "Indent C preprocessor directives to reflect nesting and more") (description "GNU Cppi processes C source code files to properly indent the diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index b87e8a210..ca1554743 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -133,7 +133,7 @@ either single machines or networked clusters.") "1smwz4x5qa4js0zf1w3asq6z7mh20zlgwbh2bk5dczw6xrk22yyr")))) (arguments `(#:configure-flags '("--enable-libgdbm-compat"))) (build-system gnu-build-system) - (home-page "http://www.gnu.org/software/gdbm/") + (home-page "http://www.gnu.org.ua/software/gdbm") (synopsis "Hash library of database functions compatible with traditional dbm") (description @@ -511,7 +511,7 @@ databases created with Recutils carry all of the expected features such as unique fields, primary keys, time stamps and more. Many different field types are supported, as is encryption.") (license license:gpl3+) - (home-page "http://www.gnu.org/software/recutils/"))) + (home-page "https://www.gnu.org/software/recutils/"))) (define-public rocksdb (package diff --git a/gnu/packages/dico.scm b/gnu/packages/dico.scm index ec20c372f..5d163a821 100644 --- a/gnu/packages/dico.scm +++ b/gnu/packages/dico.scm @@ -69,7 +69,7 @@ ("zlib" ,zlib) ;; ("wordnet" ,wordnet) ;FIXME: link failure ("libltdl" ,libltdl))) - (home-page "http://www.gnu.org/software/dico/") + (home-page "https://www.gnu.org/software/dico/") (synopsis "Implementation of DICT server (RFC 2229)") (description "GNU Dico implements a flexible dictionary server and client according to diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 0c47585fe..1e766d73b 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -74,7 +74,7 @@ (native-inputs `(("texinfo" ,texinfo) ("tar" ,tar) ("gzip" ,gzip))) - (home-page "http://savannah.gnu.org/projects/vera/") + (home-page "https://savannah.gnu.org/projects/vera/") (synopsis "List of acronyms") (description "V.E.R.A. (Virtual Entity of Relevant Acronyms) is a list of computing diff --git a/gnu/packages/ed.scm b/gnu/packages/ed.scm index 3668aac19..8ea17cbbe 100644 --- a/gnu/packages/ed.scm +++ b/gnu/packages/ed.scm @@ -46,7 +46,7 @@ (lambda _ (substitute* "testsuite/check.sh" (("/bin/sh") (which "sh")))))))) - (home-page "http://www.gnu.org/software/ed/") + (home-page "https://www.gnu.org/software/ed/") (synopsis "Line-oriented text editor") (description "Ed is a line-oriented text editor: rather than offering an overview of diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index bf6a84b0a..ad2d9cff9 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -189,7 +189,7 @@ (variable "INFOPATH") (files '("share/info"))))) - (home-page "http://www.gnu.org/software/emacs/") + (home-page "https://www.gnu.org/software/emacs/") (synopsis "The extensible, customizable, self-documenting text editor") (description "GNU Emacs is an extensible and highly customizable text editor. It is @@ -990,7 +990,7 @@ can control one of the supported external players. Thus, it supports whatever formats are supported by your music player. It also supports tagging and playlist management, all behind a clean and light user interface.") - (home-page "http://www.gnu.org/software/emms/") + (home-page "https://www.gnu.org/software/emms/") (license license:gpl3+))) (define-public emacs-emms-player-mpv @@ -1181,7 +1181,7 @@ as a library for other Emacs packages.") (arguments `(#:emacs ,emacs)) (native-inputs `(("perl" ,perl))) - (home-page "http://www.gnu.org/software/auctex/") + (home-page "https://www.gnu.org/software/auctex/") (synopsis "Integrated environment for TeX") (description "AUCTeX is a comprehensive customizable integrated environment for diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 1f01ad6ad..6579a66e4 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -300,7 +300,7 @@ sans-serif designed for on-screen reading. It is used by GNOME@tie{}3.") (native-inputs `(("fontforge" ,(package (inherit fontforge) (inputs `(("python-2" ,python-2) ,@(package-inputs fontforge))))))) - (home-page "http://www.gnu.org/software/freefont/") + (home-page "https://www.gnu.org/software/freefont/") (synopsis "Unicode-encoded outline fonts") (description "The GNU Freefont project aims to provide a set of free outline diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index bb0f85360..7ef46fcc2 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -267,7 +267,7 @@ scriptable with Guile.") "0a9bsl2nbnb138lq0h14jfc5xvz7hpb2bcsj4mjn6g1hcsl4ik0y")))) (arguments `(#:tests? #f)) ;; No check target. (build-system gnu-build-system) - (home-page "http://www.gnu.org/software/gnushogi/") + (home-page "https://www.gnu.org/software/gnushogi/") (synopsis "The game of Shogi (Japanese chess)") (description "GNU Shogi is a program that plays the game Shogi (Japanese Chess). It is similar to standard chess but this variant is far more complicated.") @@ -333,7 +333,7 @@ Chess). It is similar to standard chess but this variant is far more complicate (inputs `(("libxaw" ,libxaw) ("libxt" ,libxt))) - (home-page "http://www.gnu.org/software/gnushogi/") + (home-page "https://www.gnu.org/software/gnushogi/") (synopsis "User interface for gnushogi") (description "A graphical user interface for the package @code{gnushogi}.") ;; Contains a copy of GPLv3 but the licence notices simply @@ -501,7 +501,7 @@ level's exit. The game is presented in a 2D side view.") (sha256 (base32 "19nc5vq4bnkjvhk8srqddzhcs93jyvpm9r6lzjzwc1mgf08yg0a6")))) (build-system gnu-build-system) - (home-page "http://www.gnu.org/software/talkfilters") + (home-page "https://www.gnu.org/software/talkfilters/") (synopsis "Convert English text to humorous dialects") (description "The GNU Talk Filters are programs that convert English text into stereotyped or otherwise humorous dialects. The filters are provided as @@ -555,7 +555,7 @@ asynchronously and at a user-defined speed.") (base32 "1vw2w3jwnmn44d5vsw47f8y70xvxcsz9m5msq9fgqlzjch15qhiw")))) (build-system gnu-build-system) - (home-page "https://www.gnu.org/software/chess") + (home-page "https://www.gnu.org/software/chess/") (synopsis "Full chess implementation") (description "GNU Chess is a chess engine. It allows you to compete against the computer in a game of chess, either through the default terminal @@ -584,7 +584,7 @@ interface or via an external visual interface such as GNU XBoard.") ("sdl-gfx" ,sdl-gfx) ("fontconfig" ,fontconfig) ("check" ,check))) - (home-page "http://www.gnu.org/software/freedink/") + (home-page "https://www.gnu.org/software/freedink/") (synopsis "Twisted adventures of young pig farmer Dink Smallwood") (description "GNU FreeDink is a free and portable re-implementation of the engine @@ -611,7 +611,7 @@ To that extent, it also includes a front-end for managing all of your D-Mods.") (delete 'configure) ; no configure script (delete 'check)) ; no tests #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))))) - (home-page "http://www.gnu.org/software/freedink/") + (home-page "https://www.gnu.org/software/freedink/") (synopsis "Game data for GNU Freedink") (description "This package contains the game data of GNU Freedink.") @@ -665,7 +665,7 @@ exec ~a/bin/freedink -refdir ~a/share/dink\n" (native-inputs `(("texinfo" ,texinfo) ("pkg-config" ,pkg-config))) - (home-page "https://www.gnu.org/software/xboard") + (home-page "https://www.gnu.org/software/xboard/") (synopsis "Graphical user interface for chess programs") (description "GNU XBoard is a graphical board for all varieties of chess, including international chess, xiangqi (Chinese chess), shogi (Japanese chess) @@ -752,7 +752,7 @@ destroy, the better your score. The person with the highest score wins.") (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) ("perl" ,perl))) - (home-page "http://www.gnu.org/software/gtypist/") + (home-page "https://www.gnu.org/software/gtypist/") (synopsis "Typing tutor") (description "GNU Typist is a universal typing tutor. It can be used to learn and @@ -1158,7 +1158,7 @@ it is also possible to play GNU Go with 3rd party graphical interfaces or even in Emacs. It supports the standard game storage format (SGF, Smart Game Format) and inter-process communication format (GMP, Go Modem Protocol).") - (home-page "http://www.gnu.org/software/gnugo/") + (home-page "https://www.gnu.org/software/gnugo/") (license license:gpl3+))) (define-public extremetuxracer diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm index 86f01335a..1cd0a10fc 100644 --- a/gnu/packages/gawk.scm +++ b/gnu/packages/gawk.scm @@ -78,7 +78,7 @@ `(("bash" ,bash)) '()))) - (home-page "http://www.gnu.org/software/gawk/") + (home-page "https://www.gnu.org/software/gawk/") (synopsis "Text scanning and processing language") (description "Gawk is the GNU implementation of Awk, a specialized programming diff --git a/gnu/packages/gcal.scm b/gnu/packages/gcal.scm index 3e45163d7..425fa1f9a 100644 --- a/gnu/packages/gcal.scm +++ b/gnu/packages/gcal.scm @@ -34,7 +34,7 @@ (base32 "1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci")))) (build-system gnu-build-system) - (home-page "https://www.gnu.org/software/gcal") + (home-page "https://www.gnu.org/software/gcal/") (synopsis "Calculating and printing a wide variety of calendars") (description "Gcal is a program to calculate and print calendars on the diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index cfd33f85a..72933c7e6 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -318,7 +318,7 @@ where the OS part is overloaded to denote a specific ABI---into GCC for several languages, including C, C++, Objective-C, Fortran, Java, Ada, and Go. It also includes runtime support libraries for these languages.") (license gpl3+) - (home-page "http://gcc.gnu.org/")))) + (home-page "https://gcc.gnu.org/")))) (define-public gcc-4.8 (package (inherit gcc-4.7) @@ -859,5 +859,5 @@ effective code.") implemented by the GNU C Compiler (gcc). As a reference, it is not intended to be a tutorial of the language. Rather, it outlines all of the constructs of the language. Library functions are not included.") - (home-page "http://www.gnu.org/software/gnu-c-manual") + (home-page "https://www.gnu.org/software/gnu-c-manual/") (license fdl1.3+))) diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 26ab6777f..25272e2d7 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -85,7 +85,7 @@ ;; When tests fail, we want to know the details. #:make-flags '("VERBOSE=yes"))) - (home-page "http://www.gnu.org/software/gettext/") + (home-page "https://www.gnu.org/software/gettext/") (synopsis "Tools and documentation for translation (used to build other packages)") (description diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 2c7b86c04..33a679f50 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -210,7 +210,7 @@ file format. It also includes a C library that implements the graphics capabilities of the PostScript language. It supports a wide variety of output file formats and printers.") (license license:agpl3+) - (home-page "http://www.gnu.org/software/ghostscript/") + (home-page "https://www.gnu.org/software/ghostscript/") (properties '((upstream-name . "gnu-ghostscript"))))) (define-public ghostscript/x @@ -261,7 +261,7 @@ output file formats and printers.") provides the reference implementation of the raster printer driver architecture.") (license license:expat) - (home-page "http://www.gnu.org/software/ghostscript/"))) + (home-page "https://www.gnu.org/software/ghostscript/"))) (define-public gs-fonts (package diff --git a/gnu/packages/gnu-doc.scm b/gnu/packages/gnu-doc.scm index 3daa54ff1..d5a782bd1 100644 --- a/gnu/packages/gnu-doc.scm +++ b/gnu/packages/gnu-doc.scm @@ -90,7 +90,7 @@ list.") (string-append source "/standards.texi")) (system* "gzip" (string-append info-dir "/maintain.info")) (system* "gzip" (string-append info-dir "/standards.info")))))) - (home-page "http://www.gnu.org/prep/standards/") + (home-page "https://www.gnu.org/prep/standards/") (synopsis "GNU coding standards and maintainer information") (description "The GNU Coding Standards were written by Richard Stallman and other GNU Project volunteers. Their purpose is to make the GNU system diff --git a/gnu/packages/gnu-pw-mgr.scm b/gnu/packages/gnu-pw-mgr.scm index 461f4f8cb..906e7d3cf 100644 --- a/gnu/packages/gnu-pw-mgr.scm +++ b/gnu/packages/gnu-pw-mgr.scm @@ -43,7 +43,7 @@ (native-inputs `(("which" ,which) ("autogen" ,autogen))) - (home-page "http://www.gnu.org/software/gnu-pw-mgr/") + (home-page "https://www.gnu.org/software/gnu-pw-mgr/") (synopsis "Retrieve login credentials without recording passwords") (description "This program is designed to make it easy to reconstruct difficult diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index bcd467581..7bc17ad06 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -147,7 +147,7 @@ files, and archive files. Each file format is implemented as a plugin, so new formats can be added easily. The package also contains a command-line tool to extract metadata from a file and print the results.") (license license:gpl3+) - (home-page "http://www.gnu.org/software/libextractor/"))) + (home-page "https://www.gnu.org/software/libextractor/"))) (define-public libmicrohttpd (package diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 4a5f27a2a..6bcea6a37 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -654,7 +654,7 @@ standards.") '("default16.png" "default22.png" "default24.png" "default32.png" "default48.png" "content/icon64.png" "mozicon128.png" "default256.png"))))))))) - (home-page "http://www.gnu.org/software/gnuzilla/") + (home-page "https://www.gnu.org/software/gnuzilla/") (synopsis "Entirely free browser derived from Mozilla Firefox") (description "IceCat is the GNU version of the Firefox browser. It is entirely free diff --git a/gnu/packages/gperf.scm b/gnu/packages/gperf.scm index 9d9aaba3c..de596e925 100644 --- a/gnu/packages/gperf.scm +++ b/gnu/packages/gperf.scm @@ -36,7 +36,7 @@ "0gnnm8iqcl52m8iha3sxrzrl9mcyhg7lfrhhqgdn4zj00ji14wbn")))) (build-system gnu-build-system) (arguments '(#:parallel-tests? #f)) - (home-page "http://www.gnu.org/software/gperf/") + (home-page "https://www.gnu.org/software/gperf/") (synopsis "Perfect hash function generator") (description "gperf is a perfect hash function generator. For a given list of diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm index e7a6fbda1..46e1ccf23 100644 --- a/gnu/packages/groff.scm +++ b/gnu/packages/groff.scm @@ -57,7 +57,7 @@ formatted output based on formatting commands contained within the text. It is usually the formatter of \"man\" documentation pages.") (license gpl3+) - (home-page "http://www.gnu.org/software/groff/"))) + (home-page "https://www.gnu.org/software/groff/"))) ;; There are no releases, so we take the latest commit. (define-public roffit diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm index 4c8f818f9..17b44d9f4 100644 --- a/gnu/packages/gsasl.scm +++ b/gnu/packages/gsasl.scm @@ -68,7 +68,7 @@ a generic, GSS interface, with which the calling application interacts via this library, freeing the application developer from needing to know about the underlying security implementation.") (license license:gpl3+) - (home-page "http://www.gnu.org/software/gss/"))) + (home-page "https://www.gnu.org/software/gss/"))) (define-public gsasl (package @@ -96,4 +96,4 @@ Security Layer framework. On network servers such as IMAP or SMTP servers, SASL is used to handle client/server authentication. This package contains both a library and a command-line tool to access the library.") (license license:gpl3+) - (home-page "http://www.gnu.org/software/gsasl/"))) + (home-page "https://www.gnu.org/software/gsasl/"))) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index db19c9c93..69ff53c7d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -934,7 +934,7 @@ documents.") (description "Includes guile-clutter, guile-gnome-gstreamer, guile-gnome-platform (GNOME developer libraries), and guile-gtksourceview.") - (home-page "http://www.gnu.org/software/guile-gnome/") + (home-page "https://www.gnu.org/software/guile-gnome/") (license license:gpl2+))) ;;; diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 96ef021fb..235b06cf9 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -131,7 +131,7 @@ official extension language of the GNU system. It is an implementation of the Scheme language which can be easily embedded in other applications to provide a convenient means of extending the functionality of the application without requiring the source code to be rewritten.") - (home-page "http://www.gnu.org/software/guile/") + (home-page "https://www.gnu.org/software/guile/") (license license:lgpl2.0+))) (define-public guile-2.0 @@ -207,7 +207,7 @@ official extension language of the GNU system. It is an implementation of the Scheme language which can be easily embedded in other applications to provide a convenient means of extending the functionality of the application without requiring the source code to be rewritten.") - (home-page "http://www.gnu.org/software/guile/") + (home-page "https://www.gnu.org/software/guile/") (license license:lgpl3+))) (define-public guile-2.0/fixed @@ -537,7 +537,7 @@ library.") (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("ed" ,ed) ("which" ,which) ("guile" ,guile-2.0))) - (home-page "http://www.gnu.org/software/mcron/") + (home-page "https://www.gnu.org/software/mcron/") (synopsis "Run jobs at scheduled times") (description "GNU Mcron is a complete replacement for Vixie cron. It is used to run diff --git a/gnu/packages/gv.scm b/gnu/packages/gv.scm index 446b2946b..b2e1fbb21 100644 --- a/gnu/packages/gv.scm +++ b/gnu/packages/gv.scm @@ -71,4 +71,4 @@ With it, one can view and navigate through PostScript and PDF documents in X Windows.") (license license:gpl3+) - (home-page "http://www.gnu.org/software/gv/"))) + (home-page "https://www.gnu.org/software/gv/"))) diff --git a/gnu/packages/gxmessage.scm b/gnu/packages/gxmessage.scm index c6cba2cd7..0150dd0d6 100644 --- a/gnu/packages/gxmessage.scm +++ b/gnu/packages/gxmessage.scm @@ -52,7 +52,7 @@ (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) - (home-page "http://www.gnu.org/software/gxmessage/") + (home-page "https://www.gnu.org/software/gxmessage/") (synopsis "Open popup message window with buttons for return") (description "GNU gxmessage is a program that pops up dialog windows, which display a message to the user and waits for their action. The program then exits diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 2d7b7b2ac..b5da4cb96 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -96,7 +96,7 @@ `(("flex" ,flex) ("bison" ,bison))) (arguments `(#:tests? #f)) - (home-page "http://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html") + (home-page "https://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html") (synopsis "Mach 3.0 interface generator for the Hurd") (description "GNU MIG is the GNU distribution of the Mach 3.0 interface generator @@ -145,7 +145,7 @@ communication.") "ac_cv_search_clnt_create=no") #:tests? #f)) - (home-page "http://www.gnu.org/software/hurd/hurd.html") + (home-page "https://www.gnu.org/software/hurd/hurd.html") (synopsis "GNU Hurd headers") (description "This package provides C headers of the GNU Hurd, used to build the GNU C @@ -179,7 +179,7 @@ Library and other user programs.") (lambda _ (zero? (system* "make" "-Clibihash" "libihash.a"))) %standard-phases))))) - (home-page "http://www.gnu.org/software/hurd/hurd.html") + (home-page "https://www.gnu.org/software/hurd/hurd.html") (synopsis "GNU Hurd libraries") (description "This package provides libihash, needed to build the GNU C diff --git a/gnu/packages/idutils.scm b/gnu/packages/idutils.scm index 63760c84e..abab0c16b 100644 --- a/gnu/packages/idutils.scm +++ b/gnu/packages/idutils.scm @@ -38,7 +38,7 @@ (patches (search-patches "diffutils-gets-undeclared.patch")))) (build-system gnu-build-system) (native-inputs `(("emacs" ,emacs-minimal))) - (home-page "http://www.gnu.org/software/idutils/") + (home-page "https://www.gnu.org/software/idutils/") (synopsis "Identifier database utilities") (description "The GNU idutils package includes tools to create an index of textual diff --git a/gnu/packages/indent.scm b/gnu/packages/indent.scm index bd36f7bb4..4950a2612 100644 --- a/gnu/packages/indent.scm +++ b/gnu/packages/indent.scm @@ -53,4 +53,4 @@ several different styles such as GNU, BSD or K&R. It has some flexibility to deal with incomplete or malformed syntax. GNU indent offers several extensions over the standard utility.") (license license:gpl3+) - (home-page "http://www.gnu.org/software/indent/"))) + (home-page "https://www.gnu.org/software/indent/"))) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index b6d25f4a2..68232d6b1 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -124,7 +124,7 @@ cryptography.") ;; #endif ("libgcrypt" ,libgcrypt-1.5) ("libtasn1" ,libtasn1))) - (home-page "http://www.gnu.org/software/shishi/") + (home-page "https://www.gnu.org/software/shishi/") (synopsis "Implementation of the Kerberos 5 network security system") (description "GNU Shishi is a free implementation of the Kerberos 5 network security diff --git a/gnu/packages/libidn.scm b/gnu/packages/libidn.scm index 3af19b1c7..1dd9c78eb 100644 --- a/gnu/packages/libidn.scm +++ b/gnu/packages/libidn.scm @@ -47,7 +47,7 @@ Java libraries.") ;; The C code is dual-licensed gpl2+ lgpl3+, the manual is fdl1.3+, ;; the command line tool is gpl3+. (license (list gpl2+ gpl3+ lgpl3+ fdl1.3+)) - (home-page "http://www.gnu.org/software/libidn/"))) + (home-page "https://www.gnu.org/software/libidn/"))) (define-public libidn2 (package diff --git a/gnu/packages/libsigsegv.scm b/gnu/packages/libsigsegv.scm index 1755b250b..41e734535 100644 --- a/gnu/packages/libsigsegv.scm +++ b/gnu/packages/libsigsegv.scm @@ -34,7 +34,7 @@ (sha256 (base32 "16hrs8k3nmc7a8jam5j1fpspd6sdpkamskvsdpcw6m29vnis8q44")))) (build-system gnu-build-system) - (home-page "http://www.gnu.org/software/libsigsegv/") + (home-page "https://www.gnu.org/software/libsigsegv/") (synopsis "Library for handling page faults") (arguments ;; On MIPS, work around this error: diff --git a/gnu/packages/libunistring.scm b/gnu/packages/libunistring.scm index a9779d4ff..4b6534840 100644 --- a/gnu/packages/libunistring.scm +++ b/gnu/packages/libunistring.scm @@ -49,5 +49,5 @@ "GNU libunistring is a library providing functions to manipulate Unicode strings and for manipulating C strings according to the Unicode standard.") - (home-page "http://www.gnu.org/software/libunistring/") + (home-page "https://www.gnu.org/software/libunistring/") (license lgpl3+))) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ed74aa50a..afa2617a6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -181,7 +181,7 @@ #t)))))) #:allowed-references () #:tests? #f)) - (home-page "http://www.gnu.org/software/linux-libre") + (home-page "https://www.gnu.org/software/linux-libre/") (synopsis "GNU Linux-Libre kernel headers") (description "Headers of the Linux-Libre kernel.") (license license:gpl2))) @@ -333,7 +333,7 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." "INSTALL_MOD_STRIP=1" "modules_install")))))) #:tests? #f)) - (home-page "http://www.gnu.org/software/linux-libre/") + (home-page "https://www.gnu.org/software/linux-libre//") (synopsis "100% free redistribution of a cleaned Linux kernel") (description "GNU Linux-Libre is a free (as in freedom) variant of the Linux kernel. diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 425c273e0..60e381d30 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -117,7 +117,7 @@ ("readline" ,readline) ("texinfo" ,texinfo) ("texlive" ,texlive))) - (home-page "http://www.gnu.org/software/gcl") + (home-page "https://www.gnu.org/software/gcl/") (synopsis "A Common Lisp implementation") (description "GCL is an implementation of the Common Lisp language. It features the ability to compile to native object code and to load native diff --git a/gnu/packages/m4.scm b/gnu/packages/m4.scm index d1ba92876..dd944c02d 100644 --- a/gnu/packages/m4.scm +++ b/gnu/packages/m4.scm @@ -60,4 +60,4 @@ Autoconf. It is used as a macro processor, which means it processes text, expanding macros as it encounters them. It also has some built-in functions, for example to run shell commands or to do arithmetic.") (license gpl3+) - (home-page "http://www.gnu.org/software/m4/"))) + (home-page "https://www.gnu.org/software/m4/"))) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 833ef724a..d3218b1c8 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -167,7 +167,7 @@ ("linux-pam" ,linux-pam) ("libltdl" ,libltdl) ("gdbm" ,gdbm))) - (home-page "https://www.gnu.org/software/mailutils/") + (home-page "https://mailutils.org") (synopsis "Utilities and library for reading and serving mail") (description "GNU Mailutils is a collection of programs for managing, viewing and diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index e5c614cee..d7ec65f25 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -428,7 +428,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ;; etc.) Failing to do that leads to misdetections of ;; declarations by 'gcc/configure', and eventually to ;; duplicate declarations as reported in - ;; . + ;; . ("gmp-native" ,gmp) ("mpfr-native" ,mpfr) ("mpc-native" ,mpc) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 38986cdce..a2e435e99 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -191,7 +191,7 @@ Linux kernel and C library interfaces employed by user-space programs.") ;; ("perl-LocaleGettext" ,perl-LocaleGettext) ;; ("gettext" ,gettext-minimal) )) - (home-page "http://www.gnu.org/software/help2man/") + (home-page "https://www.gnu.org/software/help2man/") (synopsis "Automatically generate man pages from program --help") (description "GNU help2man is a program that converts the output of standard diff --git a/gnu/packages/marst.scm b/gnu/packages/marst.scm index 7249cf182..9b4db8be6 100644 --- a/gnu/packages/marst.scm +++ b/gnu/packages/marst.scm @@ -36,7 +36,7 @@ (sha256 (base32 "0l6swjy8fjrqw89ghc1vvakg21jmpfkpsw92yssrzkg3rg8vkrry")))) (build-system gnu-build-system) - (home-page "http://www.gnu.org/software/marst") + (home-page "https://www.gnu.org/software/marst/") (synopsis "Algol-to-C translator") (description "GNU MARST is an Algol-to-C translator. The package consists of the diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a5cdacb63..f7204ee6a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -120,7 +120,7 @@ rules, Aris also supports references to older proofs. Its use of standard logical symbols and its natural deduction interface make it easy to use for beginners.") (license license:gpl3+) - (home-page "http://www.gnu.org/software/aris/"))) + (home-page "https://www.gnu.org/software/aris/"))) (define-public c-graph (package @@ -143,7 +143,7 @@ theory in visualizing the convolution process. Rather than forcing the student to write code, the program offers an intuitive interface with interactive dialogs to guide them.") (license license:gpl3+) - (home-page "http://www.gnu.org/software/c-graph/"))) + (home-page "https://www.gnu.org/software/c-graph/"))) (define-public coda (package @@ -205,7 +205,7 @@ prefixes (micro-, kilo-, etc.). It can also handle nonlinear conversions such as Fahrenheit to Celsius. Its interpreter is powerful enough to be used effectively as a scientific calculator.") (license license:gpl3+) - (home-page "http://www.gnu.org/software/units/"))) + (home-page "https://www.gnu.org/software/units/"))) (define-public double-conversion (package @@ -254,7 +254,7 @@ searched using a simple command-line tool, choosing from three databases: universal constants, atomic numbers, and constants related to semiconductors.") (license license:gpl3+) - (home-page "http://www.gnu.org/software/dionysus/"))) + (home-page "https://www.gnu.org/software/dionysus/"))) (define-public gsl (package @@ -271,7 +271,7 @@ semiconductors.") (build-system gnu-build-system) (arguments `(#:parallel-tests? #f)) - (home-page "http://www.gnu.org/software/gsl/") + (home-page "https://www.gnu.org/software/gsl/") (synopsis "Numerical library for C and C++") (description "The GNU Scientific Library is a library for numerical analysis in C @@ -2000,7 +2000,7 @@ processor cores.") ("popt" ,popt))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.gnu.org/software/gsegrafix/") + (home-page "https://www.gnu.org/software/gsegrafix/") (synopsis "GNOME application to create scientific and engineering plots") (description "GSEGrafix is an application which produces high-quality graphical plots for science and engineering. Plots are specified via simple ASCII @@ -2809,7 +2809,7 @@ patterns and allows you to zoom in and out of them infinitely in a fluid, continuous manner. It also includes tutorials that help to explain how fractals are built. It can generate many different fractal types such as the Mandelbrot set.") - (home-page "http://www.gnu.org/software/xaos/") + (home-page "https://www.gnu.org/software/xaos/") (license license:gpl2+))) (define-public hypre @@ -3091,6 +3091,6 @@ Longest Commons Subsequence of a set of strings.") (description "GNU JACAL is an interactive symbolic mathematics program based on Scheme. It manipulate and simplify a range of mathematical expressions such as equations, scalars, vectors, and matrices.") - (home-page "http://www.gnu.org/software/jacal") + (home-page "https://www.gnu.org/software/jacal/") (license license:gpl3+))) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c32bffcb8..cbb4d4eab 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1233,7 +1233,7 @@ support, and more.") the Readline library to handle input, so it features convenient navigation of text as well as tab-completion of buddy names, commands and English words. It is also scriptable and extensible via Guile.") - (home-page "https://www.gnu.org/software/freetalk") + (home-page "https://www.gnu.org/software/freetalk/") (license license:gpl3+))) (define-public libmesode diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index c7612f89a..0ad4a2a6c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1757,7 +1757,7 @@ allows you to send JACK MIDI events (i.e. play) using your PC keyboard.") ;; prevents us from using pulseaudio (inputs `(("ncurses" ,ncurses) ("alsa" ,alsa-lib))) - (home-page "http://www.gnu.org/software/cursynth") + (home-page "https://www.gnu.org/software/cursynth/") (synopsis "Polyphonic and MIDI subtractive music synthesizer using curses") (description "GNU cursynth is a polyphonic synthesizer that runs graphically in the terminal. It is built on a full-featured subtractive diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm index 6949e1e03..9f1a87b18 100644 --- a/gnu/packages/ncurses.scm +++ b/gnu/packages/ncurses.scm @@ -169,7 +169,7 @@ well as multiple highlights and forms characters. It is typically used to implement user interfaces for command-line applications. The accompanying ncursesw library provides wide character support.") (license x11) - (home-page "http://www.gnu.org/software/ncurses/"))) + (home-page "https://www.gnu.org/software/ncurses/"))) (define-public dialog (package diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index e36903b8a..0c7dcd0fc 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -76,7 +76,7 @@ (base32 "1xsiivjjyhqcs6dyjcshrnxlgypvyfzacjz7gcjgl88xiw9lylri")))) (build-system gnu-build-system) - (home-page "http://www.gnu.org/software/macchanger") + (home-page "https://www.gnu.org/software/macchanger/") (synopsis "Viewing and manipulating MAC addresses of network interfaces") (description "GNU MAC Changer is a utility for viewing and changing MAC addresses of networking devices. New addresses may be set explicitly or diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm index 2e205ddd3..ddae1a7f8 100644 --- a/gnu/packages/ocr.scm +++ b/gnu/packages/ocr.scm @@ -38,7 +38,7 @@ "1m2dblgvvjs48rsglfdwq0ib9zk8h9n34xsh67ibrg0g0ffbw477")))) (build-system gnu-build-system) (native-inputs `(("lzip" ,lzip))) - (home-page "http://www.gnu.org/software/ocrad/") + (home-page "https://www.gnu.org/software/ocrad/") (synopsis "Optical character recognition based on feature extraction") (description "GNU Ocrad is an optical character recognition program based on a diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index cabfc862a..7edce69b2 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -198,7 +198,7 @@ ("guile-json" ,guile-json) ("guile-ssh" ,guile-ssh))) - (home-page "http://www.gnu.org/software/guix") + (home-page "https://www.gnu.org/software/guix/") (synopsis "Functional package manager for installed software packages and versions") (description "GNU Guix is a functional package manager for the GNU system, and is diff --git a/gnu/packages/pem.scm b/gnu/packages/pem.scm index 324ed607c..df0ee54c4 100644 --- a/gnu/packages/pem.scm +++ b/gnu/packages/pem.scm @@ -37,7 +37,7 @@ "03iqcki1lakkck1akdyvljjapgqda3l0rh38id7jhrac9kcxqgg2")))) (build-system gnu-build-system) (inputs `(("perl" ,perl))) - (home-page "http://www.gnu.org/software/pem/") + (home-page "https://www.gnu.org/software/pem/") (synopsis "Personal expenses manager") (description "GNU Pem is a simple tool for tracking personal income and diff --git a/gnu/packages/popt.scm b/gnu/packages/popt.scm index a9b5f501d..4978ea729 100644 --- a/gnu/packages/popt.scm +++ b/gnu/packages/popt.scm @@ -144,5 +144,5 @@ function may be in both short (e.g., \"-h\") and long (\"--help\") formats, as specified by the GNU coding standards. Additionally, the output of the standard options \"--help\" and \"--version\" is generated automatically.") - (home-page "http://www.gnu.org/software/gengetopt/gengetopt.html") + (home-page "https://www.gnu.org/software/gengetopt/gengetopt.html") (license gpl3+))) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index 3af777730..a11c34330 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -94,7 +94,7 @@ "tests/gps-ref/psmandup.ps") (("#! */bin/sh") (string-append "#!" (which "sh"))))))))) - (home-page "http://www.gnu.org/software/a2ps") + (home-page "https://www.gnu.org/software/a2ps/") (synopsis "Any file to PostScript, including pretty-printing") (description "GNU a2ps converts almost anything to a PostScript file, ready for @@ -120,7 +120,7 @@ special cases, such as pretty-printing \"--help\" output.") (arguments ;; Must define DIFF_CMD for tests to pass '(#:configure-flags '("CPPFLAGS=-DDIFF_CMD=\\\"diff\\\""))) - (home-page "http://www.gnu.org/software/trueprint") + (home-page "https://www.gnu.org/software/trueprint/") (synopsis "Pretty-print C sources and other plain text to PostScript") (description "GNU Trueprint translates C source code files as PostScript files. @@ -141,7 +141,7 @@ indentation counting, function and file indices and more.") (base32 "1fy0ymvzrrvs889zanxcaxjfcxarm2d3k43c9frmbl1ld7dblmkd")))) (build-system gnu-build-system) - (home-page "http://www.gnu.org/software/enscript") + (home-page "https://www.gnu.org/software/enscript/") (synopsis "Generating PostScript, including pretty-printing") (description "GNU Enscript is a program to convert ASCII text files to PostScript, @@ -215,7 +215,7 @@ to @code{IOStreams}.") "tests/test.tcl.html") (("#! */bin/sh") "#!/bin/sh"))) %standard-phases))) - (home-page "http://www.gnu.org/software/src-highlite") + (home-page "https://www.gnu.org/software/src-highlite/") (synopsis "Produce a document with syntax highlighting from a source file") (description "GNU source-highlight reads in a source code file and produces an output diff --git a/gnu/packages/pth.scm b/gnu/packages/pth.scm index 50385b14f..5b8edc6cf 100644 --- a/gnu/packages/pth.scm +++ b/gnu/packages/pth.scm @@ -38,7 +38,7 @@ (build-system gnu-build-system) (arguments '(#:parallel-build? #f)) - (home-page "http://www.gnu.org/software/pth") + (home-page "https://www.gnu.org/software/pth/") (synopsis "Portable thread library") (description "GNU Pth is a portable library providing non-preemptive, priority-based diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm index 16a31afd7..f6ebbcc26 100644 --- a/gnu/packages/readline.scm +++ b/gnu/packages/readline.scm @@ -87,7 +87,7 @@ commands, letting you easily recall, edit and re-enter past commands. It features both Emacs-like and vi-like keybindings, making its usage comfortable for anyone.") (license gpl3+) - (home-page "http://savannah.gnu.org/projects/readline/")))) + (home-page "https://savannah.gnu.org/projects/readline/")))) (define-public readline-6.2 (package (inherit readline) diff --git a/gnu/packages/rush.scm b/gnu/packages/rush.scm index 36a8f2069..1b4ea6bb5 100644 --- a/gnu/packages/rush.scm +++ b/gnu/packages/rush.scm @@ -35,7 +35,7 @@ (base32 "1vxdb81ify4xcyygh86250pi50krb16dkj42i5ii4ns3araiwckz")))) (build-system gnu-build-system) - (home-page "http://www.gnu.org/software/rush/") + (home-page "https://www.gnu.org/software/rush/") (synopsis "Restricted user (login) shell") (description "GNU Rush is a restricted user shell, for systems on which users are to diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index fec872f5f..746fbc969 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -183,7 +183,7 @@ ;; Fails to build on MIPS, see . (supported-systems (delete "mips64el-linux" %supported-systems)) - (home-page "http://www.gnu.org/software/mit-scheme/") + (home-page "https://www.gnu.org/software/mit-scheme/") (synopsis "A Scheme implementation with integrated editor and debugger") (description "GNU/MIT Scheme is an implementation of the Scheme programming diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 5103aeed6..f73a26cff 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -423,7 +423,7 @@ directory.") (description "Guile-SDL is a set of bindings to the Simple DirectMedia Layer (SDL). With them, Guile programmers can have easy access to graphics, sound and device input (keyboards, joysticks, mice, etc.).") - (home-page "http://gnu.org/s/guile-sdl") + (home-page "https://www.gnu.org/software/guile-sdl/") (license gpl3+))) (define-public guile-sdl2 diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index ac43f57aa..fd0f0bd38 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -149,7 +149,7 @@ command line tool for interacting with libtocc.") (base32 "1frdmgrmb509fxbdpsxxw3lvvwv7xm1pavqrqgm4jg698iix6xfw")))) (build-system gnu-build-system) - (home-page "https://www.gnu.org/software/bool") + (home-page "https://www.gnu.org/software/bool/") (synopsis "Finding text and HTML files that match boolean expressions") (description "GNU Bool is a utility to perform text searches on files using Boolean diff --git a/gnu/packages/serveez.scm b/gnu/packages/serveez.scm index 2423e35c9..974db8611 100644 --- a/gnu/packages/serveez.scm +++ b/gnu/packages/serveez.scm @@ -47,7 +47,7 @@ (find-files "test" "^t[0-9]{3}$") (("/bin/sh") (which "sh")))) %standard-phases))) - (home-page "http://www.gnu.org/software/serveez/") + (home-page "https://www.gnu.org/software/serveez/") (synopsis "Framework for implementing IP-based servers") (description "GNU Serveez is a server framework providing the routines necessary to diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 793d8b9df..a05ac114d 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -89,7 +89,7 @@ `(("glib" ,glib "bin") ;for glib-genmarshal ("perl" ,perl) ("pkg-config" ,pkg-config))) - (home-page "http://www.gnu.org/software/pspp/") + (home-page "https://www.gnu.org/software/pspp/") (synopsis "Statistical analysis") (description "GNU PSPP is a statistical analysis program. It can perform diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 87261825c..87679e5fb 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -70,7 +70,7 @@ communications via sockets, and various methods for data handling, such as serialization and XML parsing. It includes the uCommon C++ library, a smaller reimplementation.") (license license:gpl2+) ; plus runtime exception - (home-page "http://www.gnu.org/software/commoncpp"))) + (home-page "https://www.gnu.org/software/commoncpp/"))) (define-public ucommon (package @@ -90,7 +90,7 @@ to facilitate using C++ design patterns even for very deeply embedded applications, such as for systems using uclibc along with posix threading support.") (license license:gpl3+) - (home-page "http://www.gnu.org/software/commoncpp") + (home-page "https://www.gnu.org/software/commoncpp/") (properties '((ftp-directory . "/gnu/commoncpp"))))) (define-public ccrtp @@ -114,7 +114,7 @@ personal client applications. It is flexible in its design, allowing it to function as a framework for the framework, rather than just being a packet-manipulation library.") (license license:gpl2+) ; plus runtime exception - (home-page "http://www.gnu.org/software/ccrtp"))) + (home-page "https://www.gnu.org/software/ccrtp/"))) (define-public osip @@ -133,7 +133,7 @@ packet-manipulation library.") used to provide multimedia and telecom software developers with an interface to initiate and control SIP sessions.") (license license:lgpl2.1+) - (home-page "http://www.gnu.org/software/osip"))) + (home-page "https://www.gnu.org/software/osip/"))) (define-public exosip @@ -200,7 +200,7 @@ there is no central point for media intercept or capture and thus it can be used to construct a secure telephone system that operates over the public internet.") (license license:gpl3+) - (home-page "http://www.gnu.org/software/sipwitch"))) + (home-page "https://www.gnu.org/software/sipwitch/"))) (define-public libsrtp (package diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 404fd0339..46c578f14 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -640,7 +640,7 @@ develop documents with LaTeX, in a single application.") (native-inputs `(("texlive" ,texlive) ("automake" ,automake))) - (home-page "http://www.gnu.org/software/teximpatient") + (home-page "https://www.gnu.org/software/teximpatient/") (synopsis "Book on TeX, plain TeX and Eplain") (description "@i{TeX for the Impatient} is a ~350 page book on TeX, plain TeX, and Eplain, originally written by Paul Abrahams, Kathryn Hargreaves, diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index d21394e74..6ec2bb8e9 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -51,7 +51,7 @@ (variable "INFOPATH") (files '("share/info"))))) - (home-page "http://www.gnu.org/software/texinfo/") + (home-page "https://www.gnu.org/software/texinfo/") (synopsis "The GNU documentation format") (description "Texinfo is the official documentation format of the GNU project. It diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 695ca0a2b..ba54d1d00 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -48,7 +48,7 @@ (system* "./configure" (string-append "--prefix=" out))))) %standard-phases))) - (home-page "http://www.gnu.org/software/time/") + (home-page "https://www.gnu.org/software/time/") (synopsis "Run a command, then display its resource usage") (description "Time is a command that displays information about the resources that a diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 301a705cf..3746579eb 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -63,7 +63,7 @@ "0869cp6jx7cajgv6cnddsh3vc7bimmdkdjn80y1jpb4iss7plvsg")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) - (home-page "http://www.gnu.org/software/libtasn1/") + (home-page "https://www.gnu.org/software/libtasn1/") (synopsis "ASN.1 library") (description "GNU libtasn1 is a library implementing the ASN.1 notation. It is used diff --git a/gnu/packages/unrtf.scm b/gnu/packages/unrtf.scm index e11c9445c..3a15171a5 100644 --- a/gnu/packages/unrtf.scm +++ b/gnu/packages/unrtf.scm @@ -63,7 +63,7 @@ (getenv "PATH"))) (zero? (system* "autoreconf" "-vfi")))))) (build-system gnu-build-system) - (home-page "http://www.gnu.org/software/unrtf") + (home-page "https://www.gnu.org/software/unrtf/") (synopsis "Convert Rich Text Format documents to other formats") (description "GNU UnRTF converts text documents from RTF to HTML, LaTeX, or troff. diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm index b412bed9d..7bfe76365 100644 --- a/gnu/packages/uucp.scm +++ b/gnu/packages/uucp.scm @@ -47,7 +47,7 @@ (string-append "--infodir=" out "/share/info"))))) %standard-phases))) - (home-page "http://www.gnu.org/software/uucp/uucp.html") + (home-page "https://www.gnu.org/software/uucp/uucp.html") (synopsis "UUCP protocol implementation") (description "Taylor UUCP is the GNU implementation of UUCP (Unix-to-Unix Copy), a diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 57589c04a..6d8fb2d2c 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -808,7 +808,7 @@ projects, from individuals to large-scale enterprise operations.") "1zsx7bb0rgvvvisiy4zlixf56ay8wbd9qqqcp1a1g0m1gl6mlg86")))) (build-system gnu-build-system) (native-inputs `(("ed" ,ed))) - (home-page "http://www.gnu.org/software/rcs/") + (home-page "https://www.gnu.org/software/rcs/") (synopsis "Per-file local revision control system") (description "RCS is the original Revision Control System. It works on a @@ -961,7 +961,7 @@ large, complex patch files.") ;; These are needed for the tests (native-inputs `(("git" ,git) ("cvs" ,cvs))) - (home-page "http://www.gnu.org/software/cssc/") + (home-page "https://www.gnu.org/software/cssc/") (synopsis "File-based version control like SCCS") (description "GNU CSSC provides a replacement for the legacy Unix source code control system SCCS. This allows old code still under that system to be diff --git a/gnu/packages/xnee.scm b/gnu/packages/xnee.scm index 84dd85b2e..fc5130c0e 100644 --- a/gnu/packages/xnee.scm +++ b/gnu/packages/xnee.scm @@ -50,7 +50,7 @@ ("xproto" ,xproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.gnu.org/software/xnee/") + (home-page "https://www.gnu.org/software/xnee/") (synopsis "Record, replay and distribute user actions under X11") (description "GNU Xnee is a program that can record, replay and distribute user -- cgit v1.3 From bf5b6fb294331f108cdb5b2555dd357f69321821 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Mar 2017 20:23:33 -0500 Subject: gnu: thefuck: Upgrade to 3.15 and enable tests. * gnu/packages/patches/thefuck-test-environ.patch: New patch. * gnu/packages/admin.scm (thefuck): Upgrade to 3.15. [source]: Use patch. [arguments]: Remove '#:tests? #f'. Move 'check' phase after 'install'. * gnu/local.mk (dist_patch_DATA): Add patch. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 27 +++++++++++++------------ gnu/packages/patches/thefuck-test-environ.patch | 14 +++++++++++++ 3 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 gnu/packages/patches/thefuck-test-environ.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 063974b75..b14377850 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -948,6 +948,7 @@ dist_patch_DATA = \ %D%/packages/patches/texlive-texmf-CVE-2016-10243.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ + %D%/packages/patches/thefuck-test-environ.patch \ %D%/packages/patches/tidy-CVE-2015-5522+5523.patch \ %D%/packages/patches/tinyxml-use-stl.patch \ %D%/packages/patches/tipp10-fix-compiling.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9dd664ef6..8c8d1bc5f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014, 2015, 2016 Mark H Weaver -;;; Copyright © 2014, 2015, 2016 Eric Bavier +;;; Copyright © 2014, 2015, 2016, 2017 Eric Bavier ;;; Copyright © 2015, 2016 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015 Alex Sassmannshausen ;;; Copyright © 2015 Eric Dvorsak @@ -1688,7 +1688,7 @@ throughput (in the same interval).") (define-public thefuck (package (name "thefuck") - (version "3.11") + (version "3.15") (source (origin (method url-fetch) (uri (string-append "https://github.com/nvbn/thefuck/archive/" @@ -1696,19 +1696,20 @@ throughput (in the same interval).") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "04q2cn8c83f6z6wn1scla1ilrpi5ssjc64987hvmwfvwvb82bvkp")))) + "1vxas21h5mf41cb6y7f7x07858ags7qg45lkf74rc0slqbic3l1h")) + (patches (search-patches "thefuck-test-environ.patch")))) (build-system python-build-system) (arguments - '(#:tests? #f)) - ;; FIXME: 10 test failures. Some require newer pytest (> 2.9.2). - ;; Others need more work. Un-comment the below to run the tests. - ;; #:phases - ;; (modify-phases %standard-phases - ;; (replace 'check - ;; (lambda _ - ;; ;; Some tests need write access to $HOME. - ;; (setenv "HOME" "/tmp") - ;; (zero? (system* "py.test" "-v"))))))) + '(#:phases + (modify-phases %standard-phases + (delete 'check) + (add-after 'install 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Tests look for installed package + (add-installed-pythonpath inputs outputs) + ;; Some tests need write access to $HOME. + (setenv "HOME" "/tmp") + (zero? (system* "py.test" "-v"))))))) (propagated-inputs `(("python-colorama" ,python-colorama) ("python-decorator" ,python-decorator) diff --git a/gnu/packages/patches/thefuck-test-environ.patch b/gnu/packages/patches/thefuck-test-environ.patch new file mode 100644 index 000000000..0c602a38c --- /dev/null +++ b/gnu/packages/patches/thefuck-test-environ.patch @@ -0,0 +1,14 @@ +Retain environment setting of "HOME" for tests that need os.path.expanduser() +to return a readable directory in the build chroot. + +--- thefuck-3.15/tests/test_conf.py ++++ thefuck-3.15/tests/test_conf.py +@@ -12,7 +12,7 @@ + + @pytest.fixture + def environ(monkeypatch): +- data = {} ++ data = {"HOME": os.environ.get("HOME")} + monkeypatch.setattr('thefuck.conf.os.environ', data) + return data + -- cgit v1.3 From 77310a1c2d9bc2008ef810928bbb9995d775f53b Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Mar 2017 21:04:48 -0500 Subject: gnu: qutebrowser: Upgrade to 0.10.1. * gnu/packages/web.scm (qutebrowser): Upgrade to 0.10.1. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 6a8fafa23..99cd19297 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4463,7 +4463,7 @@ exploit attempts.") (define-public qutebrowser (package (name "qutebrowser") - (version "0.9.1") + (version "0.10.1") (source (origin (method url-fetch) @@ -4472,7 +4472,7 @@ exploit attempts.") "qutebrowser-" version ".tar.gz")) (sha256 (base32 - "0pf91nc0xcykahc3x7ww525c9czm8zpg80nxl8n2mrzc4ilgvass")))) + "05qryn56w2pbqhir4pl99idx7apx2xqw9f8wmbrhj59b1xgr3x2p")))) (build-system python-build-system) (native-inputs `(("asciidoc" ,asciidoc))) -- cgit v1.3 From 6b7e3362658a29145e539dfc90bb63fa1a3ec3ba Mon Sep 17 00:00:00 2001 From: Vasile Dumitrascu Date: Tue, 28 Mar 2017 22:12:31 +0200 Subject: gnu: Add emacs-idle-highlight. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-idle-highlight): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ad2d9cff9..758973c33 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3962,3 +3962,26 @@ abbreviation and automatically expand it into function templates.") (description "@code{emacs-memoize} is an Emacs library for memoizing functions.") (license license:unlicense))) + +(define-public emacs-idle-highlight + (package + (name "emacs-idle-highlight") + (version "1.1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/nonsequitur/idle-highlight-mode/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0kdv10hrgqpskjh0zvpnzwlkn5bccnqxas62gkws6njln57bf8nl")))) + (build-system emacs-build-system) + (home-page "https://www.emacswiki.org/emacs/IdleHighlight") + (synopsis "Highlights all occurences of the word the point is on") + (description + "This Emacs package provides @code{idle-highlight-mode} that sets + an idle timer to highlight all occurences in the buffer of the word under + the point.") + (license license:gpl3+))) -- cgit v1.3 From 6a91c5f2dcc1d58c8815e37d837943c181ed74db Mon Sep 17 00:00:00 2001 From: Vasile Dumitrascu Date: Wed, 29 Mar 2017 00:08:30 +0200 Subject: gnu: Add emacs-ox-twbs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-ox-twbs): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 758973c33..d0554519f 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3985,3 +3985,27 @@ memoizing functions.") an idle timer to highlight all occurences in the buffer of the word under the point.") (license license:gpl3+))) + +(define-public emacs-ox-twbs + (package + (name "emacs-ox-twbs") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/marsmining/ox-twbs/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1zaq8dczq5wijjk36114k2x3hfrqig3lyx6djril6wyk67vczyqs")))) + (build-system emacs-build-system) + (home-page "https://github.com/marsmining/ox-twbs") + (synopsis "Export org-mode docs as HTML compatible with Twitter Bootstrap") + (description + "This Emacs package outputs your org-mode docs with a simple, clean and +modern look. It implements a new HTML back-end for exporting org-mode docs as +HTML compatible with Twitter Bootstrap. By default, HTML is exported with +jQuery and Bootstrap resources included via osscdn.") + (license license:gpl3+))) -- cgit v1.3 From 239cf024b4200ce74bb0d437437903c1298343d3 Mon Sep 17 00:00:00 2001 From: Vasile Dumitrascu Date: Wed, 29 Mar 2017 00:54:57 +0200 Subject: gnu: Add emacs-highlight-sexp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs (emacs-highlight-sexp): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index d0554519f..4e2d2561a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4009,3 +4009,24 @@ modern look. It implements a new HTML back-end for exporting org-mode docs as HTML compatible with Twitter Bootstrap. By default, HTML is exported with jQuery and Bootstrap resources included via osscdn.") (license license:gpl3+))) + +(define-public emacs-highlight-sexp + (package + (name "emacs-highlight-sexp") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/daimrod/highlight-sexp/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0jwx87qkln1rg9wmv4qkgkml935fh2pkgrg5x4ca6n5dgb4q6rj1")))) + (build-system emacs-build-system) + (home-page "https://github.com/daimrod/highlight-sexp") + (synopsis "Minor mode that highlights the s-exp at the current position") + (description + "This Emacs package highlights the s-exp at the current position.") + (license license:gpl3+))) -- cgit v1.3 From c86c19914a2a892f57d0c601e2f1c4f86f64a7a4 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 29 Mar 2017 12:40:04 +0530 Subject: gnu: Add emacs-linum-relative. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-linum-relative): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 4e2d2561a..cb2792f63 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3963,6 +3963,27 @@ abbreviation and automatically expand it into function templates.") memoizing functions.") (license license:unlicense))) +(define-public emacs-linum-relative + (package + (name "emacs-linum-relative") + (version "0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/coldnew/linum-relative/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0s4frvr27866lw1rn3jal9wj5rkz9fx4yiszqv7w06azsdgsqksv")))) + (build-system emacs-build-system) + (home-page "https://github.com/coldnew/linum-relative") + (synopsis "Relative line numbering for Emacs") + (description "@code{emacs-linum-relative} displays the relative line +number on the left margin in Emacs.") + (license license:gpl2+))) + (define-public emacs-idle-highlight (package (name "emacs-idle-highlight") -- cgit v1.3 From fc7d5a34d01fb9ad84bc28942595867eda12f0ba Mon Sep 17 00:00:00 2001 From: Andy Patterson Date: Wed, 15 Mar 2017 22:12:10 -0400 Subject: gnu: ccl: Install included libraries. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lisp.scm (ccl)[arguments]: Add 'srfi-26' to '#:modules', and copy the included libraries to the output in the 'install' phase. Signed-off-by: Ludovic Courtès --- gnu/packages/lisp.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 60e381d30..208da703a 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -414,6 +414,9 @@ statistical profiler, a code coverage tool, and many other extensions.") ("subversion" ,subversion))) (arguments `(#:tests? #f ;no 'check' target + #:modules ((srfi srfi-26) + (guix build utils) + (guix build gnu-build-system)) #:phases (alist-replace 'unpack @@ -465,10 +468,16 @@ statistical profiler, a code coverage tool, and many other extensions.") ;; "guix package --search=" (_ "UNSUPPORTED"))) (heap (string-append kernel ".image"))) - (mkdir-p libdir) + (install-file kernel libdir) + (install-file heap libdir) + + (let ((dirs '("lib" "library" "examples" "contrib" + "tools" "objc-bridge"))) + (for-each copy-recursively + dirs + (map (cut string-append libdir <>) dirs))) + (mkdir-p bindir) - (copy-file kernel (string-append libdir kernel)) - (copy-file heap (string-append libdir heap)) (with-output-to-file wrapper (lambda () (display -- cgit v1.3 From 58b240783c8a1c716731f83c20da47f7dc267aa7 Mon Sep 17 00:00:00 2001 From: Andy Patterson Date: Wed, 15 Mar 2017 22:12:11 -0400 Subject: gnu: ccl: Forcibly set CCL_DEFAULT_DIRECTORY. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lisp.scm (ccl)[arguments]: Unconditionally set the CCL_DEFAULT_DIRECTORY environment variable in the wrapper script. Signed-off-by: Ludovic Courtès --- gnu/packages/lisp.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 208da703a..1fcd316fa 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -483,9 +483,7 @@ statistical profiler, a code coverage tool, and many other extensions.") (display (string-append "#!" bash "/bin/sh\n" - "if [ -z \"$CCL_DEFAULT_DIRECTORY\" ]; then\n" - " CCL_DEFAULT_DIRECTORY=" libdir "\n" - "fi\n" + "CCL_DEFAULT_DIRECTORY=" libdir "\n" "export CCL_DEFAULT_DIRECTORY\n" "exec " libdir kernel "\n")))) (chmod wrapper #o755))) -- cgit v1.3 From e93f8d984984c1e40311d7c8d1de7cca91189f2c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 30 Mar 2017 11:05:25 +0200 Subject: gnu: guile-git: Update to latest Git snapshot. * gnu/packages/guile.scm (guile-git): Update to 96dfb3b. [arguments]: Remove #:parallel-tests?. --- gnu/packages/guile.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 235b06cf9..b12122b8b 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1703,8 +1703,8 @@ is not available for Guile 2.0.") (license license:lgpl3+))) (define-public guile-git - (let ((revision "0") - (commit "969514aa7224217bc3c1a4c5312a9469ac5f13d5")) + (let ((revision "1") + (commit "96dfb3bdba39a37cf6aefb18e335118a6115f963")) (package (name "guile-git") (version (string-append "0.0-" revision "." (string-take commit 7))) @@ -1714,17 +1714,14 @@ is not available for Guile 2.0.") (uri (git-reference (url home-page) (commit commit))) (sha256 (base32 - "079l8y6pjkmahb4k6dfqh3hk34pg540rrl29aixyvv86w9bdfjil")) + "0v73251kmh1vs7gp3jh4pk4rikl4d8illwi0gnhwa55ij1mn9apl")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (add-after 'unpack 'bootstrap (lambda _ - (zero? (system* "autoreconf" "-vfi"))))) - - ;; Test suite is not parallel-safe: the tests open same-named repos. - #:parallel-tests? #f)) + (zero? (system* "autoreconf" "-vfi"))))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.3 From aabece2ef8f87c35ceb3678f39fcfd244b15bb0f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 30 Mar 2017 11:14:20 +0200 Subject: gnu: guile-git, guile-bytestructures: Switch to Guile 2.2. * gnu/packages/guile.scm (guile-bytestructures)[inputs]: Replace GUILE-2.0 with GUILE-2.2. (guile-git)[inputs]: Likewise. --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index b12122b8b..e345c1f0e 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1520,7 +1520,7 @@ is no support for parsing block and inline level HTML.") (install-file "README.md" doc) #t)))) (inputs - `(("guile" ,guile-2.0))) + `(("guile" ,guile-2.2))) (home-page "https://github.com/TaylanUB/scheme-bytestructures") (synopsis "Structured access to bytevector contents for Guile") (description @@ -1727,7 +1727,7 @@ is not available for Guile 2.0.") ("automake" ,automake) ("pkg-config" ,pkg-config))) (inputs - `(("guile" ,guile-2.0) + `(("guile" ,guile-2.2) ("libgit2" ,libgit2))) (propagated-inputs `(("guile-bytestructures" ,guile-bytestructures))) -- cgit v1.3 From 314120f2be6b15ea19c977cfad1b889d6e5e0e4d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 30 Mar 2017 11:49:41 +0200 Subject: gnu: guix: Update development snapshot. The previous snapshot lacked the FTP download fix from commit 6dfd683dc742ebb80983137f80a457af38ca7d8d. Thus, the daemon's "download" built-in would fail to download over FTP. * gnu/packages/package-management.scm (guix-devel): Update to aabece2. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 7edce69b2..330623216 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -214,9 +214,9 @@ the Nix package manager.") ;; ;; Note: use a very short commit id; with a longer one, the limit on ;; hash-bang lines would be exceeded while running the tests. - (let ((commit "73a46451af333c77d2e79aa8764f51be8c34d1ae")) + (let ((commit "aabece2ef8f87c35ceb3678f39fcfd244b15bb0f")) (package (inherit guix-0.12.0) - (version (string-append "0.12.0-6." (string-take commit 4))) + (version (string-append "0.12.0-7." (string-take commit 4))) (source (origin (method git-fetch) (uri (git-reference @@ -226,7 +226,7 @@ the Nix package manager.") (commit commit))) (sha256 (base32 - "1zfa6c1vf52rg7ba1nrz4hzgdwl16brc4iylcdnhl9mnkjg2fbr5")) + "0n8rrwwax9g6i38vq4y2xwb30irkv4c53mqcm5hqv78rb33x8z1l")) (file-name (string-append "guix-" version "-checkout")))) (arguments (substitute-keyword-arguments (package-arguments guix-0.12.0) -- cgit v1.3 From e3b2e943b871b26f178cc97a16c9f0cbf595a22a Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 29 Mar 2017 10:45:43 -0400 Subject: gnu: milkytracker: Update to 1.0.0. * gnu/packages/music.scm (milkytracker): Update to 1.0.0. [source]: Change uri; add file-name; add snippet to remove non-FSDG compliant data. [build-system]: Change from gnu-build-system to cmake-build-system. [arguments]: Remove #:make-flags; disable tests (which are no longer present). [inputs]: Change sdl to sdl2. --- gnu/packages/music.scm | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 0ad4a2a6c..3ac5be5c8 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Leo Famulari -;;; Copyright © 2016 Kei Kebreau +;;; Copyright © 2016, 2017 Kei Kebreau ;;; Copyright © 2016 John J. Foerch ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 ng0 @@ -2131,21 +2131,29 @@ of tools for manipulating and accessing your music.") (define-public milkytracker (package (name "milkytracker") - (version "0.90.86") + (version "1.0.0") (source (origin (method url-fetch) - (uri (string-append "http://milkytracker.titandemo.org/files/" - name "-" version ".tar.bz2")) + (uri (string-append "https://github.com/milkytracker/" + "MilkyTracker/archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1v9vp8vi24lkagfpr92c128whvakwgrm9pq2zf6ijpl5sh7014zb")))) - (build-system gnu-build-system) + "1p1jd4h274jvcvl05l01v9bj19zhq4sjag92v1zawyi93ib85abz")) + (modules '((guix build utils))) + ;; Remove non-FSDG compliant sample songs. + (snippet + '(begin + (delete-file-recursively "resources/music") + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(resources/music\\)") "")))))) + (build-system cmake-build-system) (arguments - `(#:make-flags '("CXXFLAGS=-lasound"))) + '(#:tests? #f)) ; no check target (inputs `(("alsa-lib" ,alsa-lib) ("jack" ,jack-1) - ("sdl" ,sdl) + ("sdl" ,sdl2) ("zlib" ,zlib))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.3 From 16ab9824b2fa6925f046e60629a69701a89f3c79 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 30 Mar 2017 14:21:03 -0400 Subject: gnu: mbedtls-apache: Update to 2.4.2 [fixes CVE-2017-2784, SLOTH and others]. See 'ChangeLog' in the source code distribution for more information about security-related bug fixes. * gnu/packages/tls.scm (mbedtls-apache): Update to 2.4.2. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 3746579eb..7bc0e95b3 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -800,7 +800,7 @@ then ported to the GNU / Linux environment.") (define-public mbedtls-apache (package (name "mbedtls-apache") - (version "2.4.0") + (version "2.4.2") (source (origin (method url-fetch) @@ -810,7 +810,7 @@ then ported to the GNU / Linux environment.") version "-apache.tgz")) (sha256 (base32 - "03bzbfidigljva6xj49k38q3kwlbj75lrky4a0ainylzsfg5bhy1")))) + "065hn5zibzflivabdh9p41dknda7wicl2zhc936dmakqfjprip8p")))) (build-system cmake-build-system) (native-inputs `(("perl" ,perl))) -- cgit v1.3 From 941a38b66e9a10061ae31cb85f699528e7909a5b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 29 Mar 2017 11:01:02 +0200 Subject: gnu: exempi: Update to 2.4.2. * gnu/packages/freedesktop.scm (exempi): Update to 2.4.2. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 4c15d4b2b..8de373c44 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -404,7 +404,7 @@ multiplexer to the KMS/DRM Linux kernel devices.") (define-public exempi (package (name "exempi") - (version "2.3.0") + (version "2.4.2") (source (origin (method url-fetch) (uri (string-append @@ -412,7 +412,7 @@ multiplexer to the KMS/DRM Linux kernel devices.") name "-" version ".tar.bz2")) (sha256 (base32 - "0jcrv3w8m415cq8xi886hcxfqbrn5dczxbzybx9bhf3dbqsyv6nq")))) + "1v665fc7x0yi7x6lzskvd8bd2anf7951svn2vd5384dblmgv43av")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "--with-boost=" -- cgit v1.3 From bdde64b079c491e0ced299ff5fc3331034aaf01b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 29 Mar 2017 11:11:37 +0200 Subject: gnu: libinput: Update to 1.7.0. * gnu/packages/freedesktop.scm (libinput, libinput-minimal): Update to 1.7.0. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 8de373c44..216ec312d 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -88,14 +88,14 @@ freedesktop.org project.") (define-public libinput (package (name "libinput") - (version "1.6.3") + (version "1.7.0") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" name "-" version ".tar.xz")) (sha256 (base32 - "18bx2fz04mf41nf3021pr9k3f741zvc6i8pzvypc6ycffac2gnkl")))) + "1a58q60j3456d3qfhkkv319aq2hn4bpimcyhib4yks817pv719hj")))) (build-system gnu-build-system) (native-inputs `(("cairo" ,cairo) -- cgit v1.3 From ece42cb381432271d8aac1bd314270ce5cb67cc3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 29 Mar 2017 11:23:14 +0200 Subject: gnu: libevdev: Update to 1.5.6. * gnu/packages/xorg.scm (libevdev): Update to 1.5.6. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 90d4660fc..63f4fd74e 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2327,7 +2327,7 @@ XC-APPGROUP, XTEST.") (define-public libevdev (package (name "libevdev") - (version "1.5.5") + (version "1.5.6") (source (origin (method url-fetch) @@ -2335,7 +2335,7 @@ XC-APPGROUP, XTEST.") name "-" version ".tar.xz")) (sha256 (base32 - "1cc00876lqvyadsfmj3sh1h2i0r3qfar98izdfar5f8q41w2009j")))) + "1256ypz93039n6km4macg158fpmjgylhmcmk20pnklxicsfpxv7c")))) (build-system gnu-build-system) (native-inputs `(("python" ,python))) (home-page "https://www.freedesktop.org/wiki/Software/libevdev/") -- cgit v1.3 From 2657fb6381faef616716b7fbfa514330302b2ca4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 29 Mar 2017 11:29:18 +0200 Subject: gnu: xcb-util-cursor: Update to 0.1.3. * gnu/packages/xorg.scm (xcb-util-cursor): Update to 0.1.3. [source]: Change to bz2 archive. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 63f4fd74e..57339d6b9 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5304,14 +5304,14 @@ The XCB util module provides the following libraries: (define-public xcb-util-cursor (package (name "xcb-util-cursor") - (version "0.1.2") + (version "0.1.3") (source (origin (method url-fetch) (uri (string-append "https://xcb.freedesktop.org/dist/" - "xcb-util-cursor-" version ".tar.gz")) + "xcb-util-cursor-" version ".tar.bz2")) (sha256 (base32 - "0bm0mp99abdfb6v4v60hq3msvk67b2x9ml3kbx5y2g18xdhm3rdr")))) + "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885")))) (build-system gnu-build-system) (native-inputs `(("m4" ,m4) -- cgit v1.3 From c3c25082e820fc3e376a757a48124924b92d816a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Mar 2017 13:44:46 +0200 Subject: gnu: ceph: Update to 12.0.1. * gnu/packages/storage.scm (ceph): Update to 12.0.1. [arguments]: Disable one new test. * gnu/packages/patches/ceph-disable-cpu-optimizations.patch: Adjust context. --- gnu/packages/patches/ceph-disable-cpu-optimizations.patch | 6 +++--- gnu/packages/storage.scm | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/patches/ceph-disable-cpu-optimizations.patch b/gnu/packages/patches/ceph-disable-cpu-optimizations.patch index f4d258b60..6d20fe3da 100644 --- a/gnu/packages/patches/ceph-disable-cpu-optimizations.patch +++ b/gnu/packages/patches/ceph-disable-cpu-optimizations.patch @@ -14,16 +14,16 @@ x86_64 systems. Also don't add anything for i686. # # SIMD_COMPILE_FLAGS # -@@ -41,7 +37,7 @@ +@@ -56,7 +53,7 @@ if(HAVE_ARM_NEON) set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mfpu=neon") endif() -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64") +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64") - set(HAVE_INTEL 1) + set(HAVE_INTEL 1) CHECK_C_COMPILER_FLAG(-msse HAVE_INTEL_SSE) if(HAVE_INTEL_SSE) -@@ -55,20 +51,4 @@ +@@ -70,20 +67,4 @@ if(HAVE_INTEL_SSE3) set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse3") endif() diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 8207c2b38..7288a0f79 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -48,14 +48,14 @@ (define-public ceph (package (name "ceph") - (version "12.0.0") + (version "12.0.1") (source (origin (method url-fetch) (uri (string-append "https://download.ceph.com/tarballs/ceph-" version ".tar.gz")) (sha256 (base32 - "0yzvwlwg85w04q4d9ac73vfpxjnl72dl6kc857ihv5k1lqbpp5d0")) + "1mgd7iqx9zgwims2bb8dbzhzv0p6z9vjxavbv8dampa34fzac3xc")) (patches (search-patches "ceph-skip-unittest_blockdev.patch" "ceph-skip-collect-sys-info-test.patch" @@ -204,6 +204,10 @@ ;; Also remove from the set_property block. (("run-tox-ceph-disk") "") (("run-tox-ceph-detect-init") "")) + ;; TODO: This also seems to fail because of /etc/os-release. + ;; How to make src/common/util.cc behave without it. + (substitute* "src/test/crush/CMakeLists.txt" + (("^add_ceph_test\\(crush-classes\\.sh.*$") "\n")) ;; More 'ceph-disk' issues here.. :-( (substitute* "src/test/erasure-code/CMakeLists.txt" (("^add_ceph_test\\(test-erasure-code-plugins\\.sh.*$") "\n") -- cgit v1.3 From 8c0117371a163240a487a6eee3d7992a9df327ea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Mar 2017 08:28:46 +0100 Subject: gnu: kodi: Embed full path to tzdata. * gnu/packages/kodi.scm (kodi)[arguments]: Add substitution for tzdata in 'patch-stuff' phase. [inputs]: Add TZDATA. --- gnu/packages/kodi.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index a60e2c054..4845c6624 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -302,7 +302,7 @@ generator library for C++.") (zero? (system* "autoreconf" "-vif")))) dirs)))) (add-after 'bootstrap-bundled-software 'patch-stuff - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) ;; Prevent the build scripts from calling autoreconf in the ;; build stage. Otherwise, it would undo the bootstrapping ;; and shebang patching that we worked so hard for. @@ -316,6 +316,11 @@ generator library for C++.") ;; to make them writable before the build process starts. (("autoreconf -vif") "chmod -R u+w .")) + (substitute* "xbmc/linux/LinuxTimezone.cpp" + (("/usr/share/zoneinfo") + (string-append (assoc-ref inputs "tzdata") + "/share/zoneinfo"))) + ;; Let's disable some tests that are known not to work here. ;; Doing this later while in the cmake "../build" directory ;; is trickier. @@ -416,6 +421,7 @@ generator library for C++.") ("sqlite" ,sqlite) ("taglib" ,taglib) ("tinyxml" ,tinyxml) + ("tzdata" ,tzdata) ("util-linux" ,util-linux) ("zip" ,zip) ("zlib" ,zlib))) -- cgit v1.3 From 4951d2f386dc5da9569a0de14e9e98009af7b3d2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Mar 2017 17:18:57 +0200 Subject: gnu: kodi: Remove silly wrapper script. * gnu/packages/kodi.scm (kodi)[arguments]: Add SYSTEM_LDFLAGS in configure-flags. Remove 'wrap' phase. Enable previously failing tests. --- gnu/packages/kodi.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 4845c6624..52e49a94f 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -286,6 +286,8 @@ generator library for C++.") (assoc-ref %build-inputs "libdvdnav-bootstrapped")) (string-append "-Dlibdvdcss_URL=" (assoc-ref %build-inputs "libdvdcss-bootstrapped")) + (string-append "-DSYSTEM_LDFLAGS=-Wl,-rpath=" + (assoc-ref %build-inputs "curl") "/lib") "-DENABLE_NONFREE=OFF") #:phases (modify-phases %standard-phases @@ -331,10 +333,6 @@ generator library for C++.") "TEST_F(TestSystemInfo, DISABLED_GetOsName)") (("TEST_F\\(TestSystemInfo, GetOsVersion\\)") "TEST_F(TestSystemInfo, DISABLED_GetOsVersion)")) - ;; FIXME: Why are these failing. - (substitute* "xbmc/network/test/TestWebServer.cpp" - (("TEST_F\\(TestWebServer, Can") - "TEST_F(TestWebServer, DISABLED_Can")) #t)) (add-before 'build 'set-build-environment (lambda _ @@ -344,14 +342,7 @@ generator library for C++.") #t)) (add-before 'check 'build-kodi-test (lambda _ - (zero? (system* "make" "kodi-test")))) - (add-after 'install 'wrap - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (curl (string-append (assoc-ref inputs "curl") "/lib"))) - (wrap-program (string-append out "/bin/kodi") - `("LD_LIBRARY_PATH" suffix (,curl))) - #t)))))) + (zero? (system* "make" "kodi-test"))))))) ;; TODO: Add dependencies for: ;; - nfs ;; - cec -- cgit v1.3 From 2513aac170781d2bbd0b8406cc425d9ce7cb9de4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Mar 2017 22:32:46 +0200 Subject: gnu: kodi: Update to 18.0_alpha-1-ec5d53d. * gnu/packages/kodi.scm (kodi): Update to 18.0_alpha-1-ec5d53d. [inputs]: Replace LIBYAJL with RAPIDJSON. --- gnu/packages/kodi.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 52e49a94f..b5d86b563 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -239,8 +239,8 @@ generator library for C++.") (define-public kodi ;; We package the git version because the current released ;; version was cut while the cmake transition was in turmoil. - (let ((commit "b35147e2bec41ce332b9788f4a6ac94d2e5999e3") - (revision "0")) + (let ((commit "ec5d53da72868ad37df8bc005452a6daaa20f20b") + (revision "1")) (package (name "kodi") (version (string-append "18.0_alpha-" revision "-" (string-take commit 7))) @@ -252,7 +252,7 @@ generator library for C++.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0rhb9rcz5h8mky8mx6idzybnpgjh2lxcjkh16z1x6fr4pis2jcbj")) + "05f0bip0w784ya72plw3p2bism5m501q07si2xbmg03vhqsagjl5")) (snippet '(begin (use-modules (guix build utils)) @@ -401,13 +401,13 @@ generator library for C++.") ("libxrandr" ,libxrandr) ("libxrender" ,libxrender) ("libxslt" ,libxslt) - ("libyajl" ,libyajl) ("lzo" ,lzo) ("mysql" ,mysql) ("openssl" ,openssl) ("pcre" ,pcre) ("pulseaudio" ,pulseaudio) ("python" ,python-2) + ("rapidjson" ,rapidjson) ("samba" ,samba) ("sqlite" ,sqlite) ("taglib" ,taglib) -- cgit v1.3 From 7f79df4ae8b8fc284898b0e002948f1694d4f47e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 30 Mar 2017 16:41:40 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.58. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.58. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index afa2617a6..8a18030d0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -358,8 +358,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.57" - "18mgf2xvjfqkg62kmffhbpgxgqpizy400b9ndagq3rlx7pcx5v1j" + (make-linux-libre "4.4.58" + "1q5y26r65wkhcav7qq3x9mvz54dgcvcw2a5scpgya61b3kpnahb2" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.3 From f62acf1eb7ae9f3a582e897abbbfb229f112b31e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 30 Mar 2017 16:42:23 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.19. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.19. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8a18030d0..c3fecd0e7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -352,8 +352,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.18" - "1f8a4z0hjl4j899pzlyblp7wbn6n5r5lxkw0hwy6ml0dm0dkscrj" + (make-linux-libre "4.9.19" + "19x6hasx7pvrjj08vy8mhylx1s63j3dwxzgqh4k18jwzjfkv3p3g" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.3 From 03d0aa8b22223b67ec9bbd363c4d5800efdbaf82 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 30 Mar 2017 16:43:00 -0400 Subject: gnu: linux-libre: Update to 4.10.7. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.10.7. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c3fecd0e7..eef934ea5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -342,8 +342,8 @@ It has been modified to remove all non-free binary blobs.") (define %intel-compatible-systems '("x86_64-linux" "i686-linux")) -(define %linux-libre-version "4.10.6") -(define %linux-libre-hash "01iv39dpqvnmynrvjk3ji5411ywazx96pkjkw4v1bm7jqvc1b7bh") +(define %linux-libre-version "4.10.7") +(define %linux-libre-hash "0cjhnq67h3kk2dx0kd3nw0f1lbxvc8jr8n5khb9bh07913ag2pyq") (define-public linux-libre (make-linux-libre %linux-libre-version -- cgit v1.3