aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/python-science.scm
AgeCommit message (Expand)Author
2024-01-16gnu: python-scipy: Update to 1.11.4....* gnu/packages/python-science.scm (python-scipy): Update to 1.11.4. [arguments]: Use mesonpy backend. [inputs]: Replace pybind11 with pybind11-2.10. [native-inputs]: Add python-click, python-doit, python-pooch, and python-pydevtool; replace python-cython with python-cython-0.29.35. Change-Id: I4b26e1b6382899bba24f84461f154e97765e08f5 Ricardo Wurmus
2024-01-10gnu: python-distributed: Disable breaking test....This test times out since the merge of the mesa-updates branch. * gnu/packages/python-science.scm (python-distributed)[arguments]: Disable test_tell_workers_when_peers_have_left. Change-Id: Ib65b971a3a821ea13d36a4be60658ffc366ca6ac Ricardo Wurmus
2023-12-15gnu: python-vaex-core: Add missing input....* gnu/packages/python-science.scm (python-vaex-core)[propagated-inputs]: Add python-click. Change-Id: Id91e925832ed107d5b346ba513a9825dc31481f6 Ricardo Wurmus
2023-12-05gnu: python-pytensor: Update to 2.18.1....* gnu/packages/python-science.scm (python-pytensor): Update to 2.18.1. Change-Id: I7992d8a00c378c008995df3d026c3e05c235ae6d Vinicius Monego
2023-12-05gnu: python-gpy: Adjust for newer python....* gnu/packages/python-science.scm (python-gpy)[source]: Add snippet to adjust python module imports. Change-Id: I0772febb97d75e0a0caa331913c9e7453d11e70d Efraim Flashner
2023-12-04gnu: Add python-pyfma....* gnu/packages/python-science.scm (python-pyfma): New variable. Change-Id: I354d3d56f2799c8c9ac9b868fcacbf88dcc5c25d Signed-off-by: Ludovic Courtès <ludo@gnu.org> Felix Gruber
2023-12-04gnu: Add python-meshzoo....* gnu/packages/python-science.scm (python-meshzoo): New variable. Change-Id: Ia41d62ebd6c4cb3c22ebe0668c36279a9ca191ac Signed-off-by: Ludovic Courtès <ludo@gnu.org> Felix Gruber
2023-11-15gnu: Add python-tdda....* gnu/packages/python-science.scm (python-tdda): New variable. Change-Id: I456aa236b3348e5b990289d8a381c2d5276a12f1 Signed-off-by: Ludovic Courtès <ludo@gnu.org> Troy Figiel
2023-11-03gnu: python-pytensor: Update to 2.17.3....* gnu/packages/python-science.scm (python-pytensor): Update to 2.17.3. Change-Id: I2843aca1df4d43883bf643e6e363bd3700202c45 Vinicius Monego
2023-11-03gnu: Add python-salib....* gnu/packages/python-science.scm (python-salib): New variable. Vinicius Monego
2023-10-17gnu: python-trimesh: Update to 3.23.5....* gnu/packages/python-science.scm (python-trimesh): Update to 3.23.5. Signed-off-by: Christopher Baines <mail@cbaines.net> Paul A. Patience
2023-10-17gnu: python-pyvista: Update to 0.42.3....* gnu/packages/python-science.scm (python-pyvista): Update to 0.42.3. Signed-off-by: Christopher Baines <mail@cbaines.net> Paul A. Patience
2023-10-08gnu: python-distributed: Disable failing tests....* gnu/packages/python-science.scm (python-distributed): Disable failing tests. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Nicolas Graves
2023-09-30gnu: Add python-numpoly....* gnu/packages/python-science.scm (python-numpoly): New variable. Vinicius Monego
2023-08-05gnu: python-pytensor: Update to 2.14.2....* gnu/packages/python-science.scm (python-pytensor): Update to 2.14.2. [native-inputs]: Add python-pytest-mock. Vinicius Monego
2023-07-29gnu: Add python-scikit-fem....* gnu/packages/python-science.scm (python-scikit-fem): New variable. Vinicius Monego
2023-07-15gnu: python-distributed: Update to 2023.7.0....* gnu/packages/python-science.scm (python-distributed): Update to 2023.7.0. Ricardo Wurmus
2023-07-13gnu: Add python-plotnine....* gnu/packages/python-science.scm (python-plotnine): New variable. Ricardo Wurmus
2023-06-29gnu: python-pandas-flavor: Update to 0.5.0....* gnu/packages/python-science.scm (python-pandas-flavor): Update to 0.5.0. [propagated-inputs]: Add python-lazy-loader and python-packaging. [home-page]: Update. Arun Isaac
2023-06-29gnu: python-distributed: Disable timeout test....* gnu/packages/python-science.scm (python-distributed)[arguments]: Disable test_nanny_timeout, because it times out. Ricardo Wurmus
2023-06-25gnu: python-trimesh: Update to 3.22.1....* gnu/packages/python-science.scm (python-trimesh): Update to 3.22.1. [arguments]<#:phases>: Update path in 'fix-build' phase. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Paul A. Patience
2023-06-25gnu: Add python-pytensor....* gnu/packages/python-science.scm (python-pytensor): New variable. Vinicius Monego
2023-06-25gnu: Add python-xarray-einstats....* gnu/packages/python-science.scm (python-xarray-einstats): New variable. Vinicius Monego
2023-06-25gnu: python-xarray: Update to 2023.6.0....* gnu/packages/python-science.scm (python-xarray): Update to 2023.6.0. [build-system]: Switch to pyproject-build-system. [arguments]: Do not override the check phase. Vinicius Monego
2023-06-25gnu: Add python-einops....* gnu/packages/python-science.scm (python-einops): New variable. Vinicius Monego
2023-06-20gnu: python-pyvista: Update to 0.39.1....* gnu/packages/python-science.scm (python-pyvista): Update to 0.39.1. [propagated-inputs]: Add python-pooch, remove python-appdirs. Signed-off-by: Christopher Baines <mail@cbaines.net> Paul A. Patience
2023-05-11gnu: python-distributed: Update to 2023.4.1....* gnu/packages/python-science.scm (python-distributed): Update to 2023.4.1. [source]: Remove snippet. [arguments]: Update build phase 'versioneer; restore 'sanity-check phase; simplify custom 'check phase; add 'fix-pytest-config phase; use #:test-flags. [build-system]: Use pyproject-build-system. [native-inputs]: Add python-importlib-metadata. Ricardo Wurmus
2023-05-10gnu: python-scikit-optimize: Fix build with newer numpy and sklearn....* gnu/packages/patches/python-scikit-optimize-1148.patch, gnu/packages/patches/python-scikit-optimize-1150.patch: New patches. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/python-science.scm (python-scikit-optimize)[source]: Fetch with git and apply patches. Ricardo Wurmus
2023-05-08gnu: python-bottleneck: Honor #:tests? flag....* gnu/packages/python-science.scm (python-bottleneck)[arguments]: Adjust custom 'check phase to honor the #:tests? flag. Efraim Flashner
2023-05-08gnu: python-bottleneck: Update to 1.3.7....* gnu/packages/python-science.scm (python-bottleneck): Update to 1.3.7. Efraim Flashner
2023-04-26gnu: python-distributed: Fix build....* gnu/packages/python-science.scm (python-distributed)[build-system]: Use pyproject-build-system. [arguments]: Hide deprecation warnings from tornado, because they break almost all tests; disable three more tests. Ricardo Wurmus
2023-04-14Merge branch 'master' into core-updates....Conflicts: gnu/local.mk gnu/packages/build-tools.scm gnu/packages/certs.scm gnu/packages/check.scm gnu/packages/compression.scm gnu/packages/cups.scm gnu/packages/fontutils.scm gnu/packages/gnuzilla.scm gnu/packages/guile.scm gnu/packages/ibus.scm gnu/packages/image-processing.scm gnu/packages/linux.scm gnu/packages/music.scm gnu/packages/nss.scm gnu/packages/pdf.scm gnu/packages/python-xyz.scm gnu/packages/qt.scm gnu/packages/ruby.scm gnu/packages/shells.scm gnu/packages/tex.scm gnu/packages/video.scm gnu/packages/vulkan.scm gnu/packages/web.scm gnu/packages/webkit.scm gnu/packages/wm.scm Maxim Cournoyer
2023-04-11gnu: python-scipy: Update to 1.10.1....* gnu/packages/python-science.scm (python-scipy): Update to 1.10.1. [build-system]: Use pyproject-build-system. [arguments]: Add #:build-backend argument. Remove loosen-requirements, build and install phases. [native-inputs]: Remove python-pypa-build. Maxim Cournoyer
2023-03-24gnu: python-scikit-allel: Use pyproject-build-system....* gnu/packages/python-science.scm (python-scikit-allel): Move up to create alphabetic order. [build-system]: Use pyproject-build-system. [arguments]: Provide test flags instead of overriding 'check phase; split out build step into new 'build-ext phase. Disable roh_mhmm tests. Ricardo Wurmus
2023-03-24gnu: Add python-scikit-optimize....* gnu/packages/python-science.scm (python-scikit-optimize): New variable. Ricardo Wurmus
2023-03-21gnu: Add python-libneuroml....* gnu/packages/python-science.scm (python-libneuroml): New variable. Lars-Dominik Braun
2023-03-21gnu: Add python-pylems....* gnu/packages/python-science.scm (python-pylems): New variable. Lars-Dominik Braun
2023-01-08gnu: Add python-pydicom....* gnu/packages/python-science.scm (python-pydicom): New variable. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Antero Mejr
2022-12-05gnu: python-sgp4: Move to astronomy....* gnu/packages/astronomy.scm: (python-sgp4): Move here from python-science.scm. [description]: Expand description, annotate acronyms, add link to CelesTrak. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Sharlatan Hellseher
2022-12-05gnu: python-sgp4: Update to 2.21....The latest version passes build on aarch64-linux system. * gnu/packages/python-science.scm (python-sgp4): Update to 2.21. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Sharlatan Hellseher
2022-12-02gnu: python-msgpack-numpy: Update to 0.4.8....* gnu/packages/python-science.scm (python-msgpack-numpy): Update to 0.4.8. Navid Afkhami
2022-11-11gnu: Add python-tspex....* gnu/packages/python-science.scm (python-tspex): New variable. Co-authored-by: Ricardo Wurmus <rekado@elephly.net> Navid Afkhami
2022-11-04gnu: Add python-pyts....* gnu/packages/python-science.scm (python-pyts): New variable. Ricardo Wurmus
2022-10-18gnu: Add python-simple-pid....* gnu/packages/python-science.scm (python-simple-pid): New variable. Signed-off-by: Ludovic Courtès <ludo@gnu.org> jgart
2022-09-29Merge branch 'master' into stagingMarius Bakke
2022-09-28gnu: Add python-simplespectral....* gnu/packages/python-science.scm (python-simplespectral): New variable. Guillaume Le Vaillant
2022-09-27Merge branch 'master' into staging....With resolved conflicts in: gnu/local.mk gnu/packages/crates-io.scm Maxim Cournoyer
2022-09-25gnu: Add python-vaex-core....* gnu/packages/python-science.scm (python-vaex-core): New variable. Ricardo Wurmus
2022-09-18gnu: python-cython: Remove duplicate version....* gnu/packages/python-xyz.scm (python-cython-0.29.32): Remove variable. * gnu/packages/python-science.scm (python-pandas)[native-inputs]: Change from PYTHON-CYTHON-0.29.32 to PYTHON-CYTHON. Marius Bakke
2022-09-18gnu: python-pandas: Update to 1.4.4....* gnu/packages/python-science.scm (python-pandas): Update to 1.4.4. [native-inputs]: Change from PYTHON-CYTHON to PYTHON-CYTHON-0.29.32. Marius Bakke
generated by cgit
t-cc") (version "1.0.41") @@ -333,38 +294,22 @@ used in argon2rs' bench suite.") (origin (method url-fetch) (uri (crate-uri "cc" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1zxzd559dbbf1iwdzmkj7czapzccs17kqqmsj9ayijpdix5rrbld")))) (build-system cargo-build-system) - (arguments - `(;#:cargo-inputs - ;(("rust-rayon" ,rust-rayon)) - #:cargo-development-inputs - (("rust-tempdir" ,rust-tempdir)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'remove-optional-deps - (lambda _ - (substitute* "Cargo.toml.orig" - ((".*optional.*") "\n") - ((".*features.*") "") - ((".*parallel.*") "")) - (delete-file "Cargo.toml") - (copy-file "Cargo.toml.orig" "Cargo.toml") - #t))) - #:tests? #f)) ; Tests require cc-test from git repo. (home-page "https://github.com/alexcrichton/cc-rs") (synopsis "Invoke the native C compiler") (description "This package provides a build-time dependency for Cargo build scripts to assist in invoking the native C compiler to compile native C code into a static archive to be linked into Rustcode.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-cfg-if +(define-public rust-cfg-if-0.1 (package (name "rust-cfg-if") (version "0.1.9") @@ -372,7 +317,7 @@ archive to be linked into Rustcode.") (origin (method url-fetch) (uri (crate-uri "cfg-if" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0csygklgz3ybpr0670rkip49zh76m43ar3k7xgypkzbzrwycx1ml")))) @@ -382,10 +327,11 @@ archive to be linked into Rustcode.") (description "This package provides a macro to ergonomically define an item depending on a large number of #[cfg] parameters. Structured like an @code{if-else} chain, the first matching branch is the item that gets emitted.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-clang-sys +(define-public rust-clang-sys-0.28 (package (name "rust-clang-sys") (version "0.28.1") @@ -393,64 +339,44 @@ depending on a large number of #[cfg] parameters. Structured like an (origin (method url-fetch) (uri (crate-uri "clang-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0ls8zcqi5bmmrvrk3b6r1ym4wlivinbv590d2dvg2xn9f44mbpl1")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-glob" ,rust-glob) - ("rust-libc" ,rust-libc) - ("rust-libloading" ,rust-libloading)) - #:cargo-development-inputs - (("rust-glob" ,rust-glob)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-environmental-variable - (lambda* (#:key inputs #:allow-other-keys) - (let ((clang (assoc-ref inputs "libclang"))) - (setenv "LIBCLANG_PATH" - (string-append clang "/lib"))) - #t))))) - (inputs - `(("libclang" ,clang))) + ;(arguments + ; `(#:phases + ; (modify-phases %standard-phases + ; (add-after 'unpack 'set-environmental-variable + ; (lambda* (#:key inputs #:allow-other-keys) + ; (let ((clang (assoc-ref inputs "libclang"))) + ; (setenv "LIBCLANG_PATH" + ; (string-append clang "/lib"))) + ; #t))))) + ;(inputs + ; `(("libclang" ,clang))) (home-page "https://github.com/KyleMayes/clang-sys") (synopsis "Rust bindings for libclang") (description "This package provides Rust bindings for @code{libclang}.") + (properties '((hidden? . #t))) (license license:asl2.0))) (define-public rust-clang-sys-0.26 (package - (inherit rust-clang-sys) + (inherit rust-clang-sys-0.28) (name "rust-clang-sys") (version "0.26.4") (source (origin (method url-fetch) (uri (crate-uri "clang-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1r50dwy5hj5gq07dn0qf8222d07qv0970ymx0j8n9779yayc3w3f")))) - (arguments - `(#:cargo-inputs - (("rust-glob" ,rust-glob-0.2) - ("rust-libc" ,rust-libc) - ("rust-libloading" ,rust-libloading)) - #:cargo-development-inputs - (("rust-glob" ,rust-glob-0.2)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-environmental-variable - (lambda* (#:key inputs #:allow-other-keys) - (let ((clang (assoc-ref inputs "libclang"))) - (setenv "LIBCLANG_PATH" - (string-append clang "/lib"))) - #t))))))) - -(define-public rust-clicolors-control + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "1r50dwy5hj5gq07dn0qf8222d07qv0970ymx0j8n9779yayc3w3f")))))) + +(define-public rust-clicolors-control-1.0 (package (name "rust-clicolors-control") (version "1.0.0") @@ -458,25 +384,20 @@ depending on a large number of #[cfg] parameters. Structured like an (origin (method url-fetch) (uri (crate-uri "clicolors-control" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1y80cgarxhrd1bz5yjm81r444v6flvy36aaxrrsac0yhfd6gvavk")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-atty" ,rust-atty) - ("rust-lazy-static" ,rust-lazy-static) - ("rust-libc" ,rust-libc) - ("rust-winapi" ,rust-winapi)))) (home-page "https://github.com/mitsuhiko/clicolors-control") (synopsis "Common utility library to control CLI colorization") (description "This package provides a common utility library to control CLI colorization.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-cloudabi +(define-public rust-cloudabi-0.0 (package (name "rust-cloudabi") (version "0.0.3") @@ -484,21 +405,19 @@ colorization.") (origin (method url-fetch) (uri (crate-uri "cloudabi" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0kxcg83jlihy0phnd2g8c2c303px3l2p3pkjz357ll6llnd5pz6x")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-bitflags" ,rust-bitflags)))) (home-page "https://nuxi.nl/cloudabi/") (synopsis "Low level interface to CloudABI") (description "Low level interface to CloudABI. Contains all syscalls and related types.") + (properties '((hidden? . #t))) (license license:bsd-2))) -(define-public rust-cmake +(define-public rust-cmake-0.1 (package (name "rust-cmake") (version "0.1.42") @@ -506,25 +425,24 @@ colorization.") (origin (method url-fetch) (uri (crate-uri "cmake" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0qkwibkvx5xjazvv9v8gvdlpky2jhjxvcz014nrixgzqfyv2byw1")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs (("rust-cc" ,rust-cc)))) (home-page "https://github.com/alexcrichton/cmake-rs") (synopsis "Rust build dependency for running cmake") (description "This package provides a build dependency for running @code{cmake} to build a native library. The CMake executable is assumed to be @code{cmake} unless the CMAKE environmental variable is set.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) ;; This package requires features which are unavailable ;; on the stable releases of Rust. -(define-public rust-compiler-builtins +(define-public rust-compiler-builtins-0.1 (package (name "rust-compiler-builtins") (version "0.1.19") @@ -532,27 +450,22 @@ CMAKE environmental variable is set.") (origin (method url-fetch) (uri (crate-uri "compiler_builtins" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1fpabpmg8paj4r5a37vmidh1jx1b7a6ilxm4s3xsxczx27ybjcjf")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-cc" ,rust-cc) - ("rust-rustc-std-workspace-core" - ,rust-rustc-std-workspace-core)))) (home-page "https://github.com/rust-lang-nursery/compiler-builtins") (synopsis "Compiler intrinsics used by the Rust compiler") (description "This package provides compiler intrinsics used by the Rust compiler. This package is primarily useful when building the @code{core} crate yourself and you need compiler-rt intrinsics.") - (properties `((hidden? . #t))) + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-constant-time-eq +(define-public rust-constant-time-eq-0.1 (package (name "rust-constant-time-eq") (version "0.1.4") @@ -560,7 +473,7 @@ need compiler-rt intrinsics.") (origin (method url-fetch) (uri (crate-uri "constant_time_eq" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "083icpr9xb72rrdxw3p4068dcspn6ai22jy7rhl2a8grfz448nlr")))) @@ -571,9 +484,10 @@ need compiler-rt intrinsics.") (description "This package compares two equal-sized byte strings in constant time. It is inspired by the Linux kernel's @code{crypto_memneq}.") + (properties '((hidden? . #t))) (license license:cc0))) -(define-public rust-core-foundation-sys +(define-public rust-core-foundation-sys-0.6 (package (name "rust-core-foundation-sys") (version "0.6.2") @@ -581,7 +495,7 @@ It is inspired by the Linux kernel's @code{crypto_memneq}.") (origin (method url-fetch) (uri (crate-uri "core-foundation-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0fzsw1j9g1x598yhwklg59l15hwzc0pyvs01w9fg2kin4598mjp7")))) @@ -590,10 +504,11 @@ It is inspired by the Linux kernel's @code{crypto_memneq}.") (synopsis "Bindings to Core Foundation for OS X") (description "Bindings to Core Foundation for OS X.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-curl-sys +(define-public rust-curl-sys-0.4 (package (name "rust-curl-sys") (version "0.4.20") @@ -601,44 +516,34 @@ It is inspired by the Linux kernel's @code{crypto_memneq}.") (origin (method url-fetch) (uri (crate-uri "curl-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "02542zmvl3fpdqf7ai4cqnamm4albx9j645dkjx5qr1myq8ax42y")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc) - ("rust-libnghttp2-sys" ,rust-libnghttp2-sys) - ("rust-libz-sys" ,rust-libz-sys) - ("rust-openssl-sys" ,rust-openssl-sys) - ("rust-winapi" ,rust-winapi)) - #:cargo-development-inputs - (("rust-cc" ,rust-cc) - ("rust-pkg-config" ,rust-pkg-config) - ("rust-openssl-src" ,rust-openssl-src) - ("rust-vcpkg" ,rust-vcpkg)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'find-openssl - (lambda* (#:key inputs #:allow-other-keys) - (let ((openssl (assoc-ref inputs "openssl"))) - (setenv "OPENSSL_DIR" openssl)) - #t))))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("curl" ,curl) - ("nghttp2" ,nghttp2) - ("openssl" ,openssl) - ("zlib" ,zlib))) + ;(arguments + ; `(#:phases + ; (modify-phases %standard-phases + ; (add-after 'unpack 'find-openssl + ; (lambda* (#:key inputs #:allow-other-keys) + ; (let ((openssl (assoc-ref inputs "openssl"))) + ; (setenv "OPENSSL_DIR" openssl)) + ; #t))))) + ;(native-inputs + ; `(("pkg-config" ,pkg-config))) + ;(inputs + ; `(("curl" ,curl) + ; ("nghttp2" ,nghttp2) + ; ("openssl" ,openssl) + ; ("zlib" ,zlib))) (home-page "https://github.com/alexcrichton/curl-rust") (synopsis "Native bindings to the libcurl library") (description "This package provides native bindings to the @code{libcurl} library.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-data-encoding +(define-public rust-data-encoding-2.1 (package (name "rust-data-encoding") (version "2.1.2") @@ -646,7 +551,7 @@ It is inspired by the Linux kernel's @code{crypto_memneq}.") (origin (method url-fetch) (uri (crate-uri "data-encoding" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "15xd6afhsjl08285piwczrafmckpp8i29padj8v12xhahshprx7l")))) @@ -655,10 +560,11 @@ It is inspired by the Linux kernel's @code{crypto_memneq}.") (synopsis "Efficient and customizable data-encoding functions") (description "This library provides encodings for many different common cases, including -hexadecimal, bas32, and base64.") +hexadecimal, base32, and base64.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-defmac +(define-public rust-defmac-0.2 (package (name "rust-defmac") (version "0.2.0") @@ -666,7 +572,7 @@ hexadecimal, bas32, and base64.") (origin (method url-fetch) (uri (crate-uri "defmac" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "01ff3jdmcc5waffkwllndnx5hsn414r7x1rq4ib73n7awsyzxkxv")))) @@ -674,24 +580,25 @@ hexadecimal, bas32, and base64.") (home-page "https://github.com/bluss/defmac") (synopsis "Macro to define lambda-like macros inline") (description "A macro to define lambda-like macros inline.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) (define-public rust-defmac-0.1 (package - (inherit rust-defmac) + (inherit rust-defmac-0.2) (name "rust-defmac") (version "0.1.3") (source (origin (method url-fetch) (uri (crate-uri "defmac" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "17giv0n0n1r64z0dahfvkjy3ys517jxyhs8sd9lmgvcljpjyryxa")))))) -(define-public rust-dirs +(define-public rust-dirs-1.0 (package (name "rust-dirs") (version "1.0.3") @@ -699,15 +606,11 @@ hexadecimal, bas32, and base64.") (origin (method url-fetch) (uri (crate-uri "dirs" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "02vigc566z5i6n9wr2x8sch39qp4arn89xhhrh18fhpm3jfc0ygn")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc) - ("rust-winapi" ,rust-winapi)))) (home-page "https://github.com/soc/dirs-rs") (synopsis "Abstractions for standard locations for various platforms") (description @@ -716,9 +619,10 @@ platform-specific standard locations of directories for config, cache and other data on Linux, Windows, macOS and Redox by leveraging the mechanisms defined by the XDG base/user directory specifications on Linux, the Known Folder API on Windows, and the Standard Directory guidelines on macOS.") + (properties '((hidden? . #t))) (license (list license:expat license:asl2.0)))) -(define-public rust-discard +(define-public rust-discard-1.0 (package (name "rust-discard") (version "1.0.4") @@ -726,7 +630,7 @@ Windows, and the Standard Directory guidelines on macOS.") (origin (method url-fetch) (uri (crate-uri "discard" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1h67ni5bxvg95s91wgicily4ix7lcw7cq0a5gy9njrybaibhyb91")))) @@ -736,9 +640,10 @@ Windows, and the Standard Directory guidelines on macOS.") (description "There are situations where you need to intentionally leak some memory but not other memory. This package provides a discard trait which allows for intentionally leaking memory") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-doc-comment +(define-public rust-doc-comment-0.3 (package (name "rust-doc-comment") (version "0.3.1") @@ -746,7 +651,7 @@ for intentionally leaking memory") (origin (method url-fetch) (uri (crate-uri "doc-comment" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "15rsqxgarfpb1yim9sbp9yfgj7p2dq6v51c6bq1a62paii9ylgcj")))) @@ -755,9 +660,10 @@ for intentionally leaking memory") (synopsis "Macro to generate doc comments") (description "This package provides a way to generate doc comments from macros.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-dtoa +(define-public rust-dtoa-0.4 (package (name "rust-dtoa") (version "0.4.4") @@ -765,7 +671,7 @@ from macros.") (origin (method url-fetch) (uri (crate-uri "dtoa" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0phbm7i0dpn44gzi07683zxaicjap5064w62pidci4fhhciv8mza")))) @@ -774,24 +680,25 @@ from macros.") (synopsis "Fast functions for printing floating-point primitives") (description "This crate provides fast functions for printing floating-point primitives to an @code{io::Write}.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) (define-public rust-dtoa-0.2 (package - (inherit rust-dtoa) + (inherit rust-dtoa-0.4) (name "rust-dtoa") (version "0.2.2") (source (origin (method url-fetch) (uri (crate-uri "dtoa" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0g96cap6si1g6wi62hsdk2fnj3sf5vd4i97zj6163j8hhnsl3n0d")))))) -(define-public rust-fallible-iterator +(define-public rust-fallible-iterator-0.2 (package (name "rust-fallible-iterator") (version "0.2.0") @@ -799,7 +706,7 @@ floating-point primitives to an @code{io::Write}.") (origin (method url-fetch) (uri (crate-uri "fallible-iterator" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1xq759lsr8gqss7hva42azn3whgrbrs2sd9xpn92c5ickxm1fhs4")))) @@ -810,10 +717,11 @@ floating-point primitives to an @code{io::Write}.") crate provides implementations for @code{Box}, @code{Vec}, @code{BTreeMap}, and @code{BTreeSet}. If the @code{std} feature is enabled, this crate additionally provides implementations for @code{HashMap} and @code{HashSet}.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-filetime +(define-public rust-filetime-0.2 (package (name "rust-filetime") (version "0.2.7") @@ -821,19 +729,11 @@ provides implementations for @code{HashMap} and @code{HashSet}.") (origin (method url-fetch) (uri (crate-uri "filetime" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0sflihq2l77xjrza7yjalnxsc7dxzg25rhzcfbd9vmyfah5kimvb")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-cfg-if" ,rust-cfg-if) - ("rust-libc" ,rust-libc) - ("rust-redox-syscall" ,rust-redox-syscall) - ("rust-winapi" ,rust-winapi)) - #:cargo-development-inputs - (("rust-tempdir" ,rust-tempdir)))) (home-page "https://github.com/alexcrichton/filetime") (synopsis "Platform-agnostic accessors of timestamps in File metadata") (description @@ -842,10 +742,11 @@ various timestamps of files in Rust. This library takes into account cross-platform differences in terms of where the timestamps are located, what they are called, and how to convert them into a platform-independent representation.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-findshlibs +(define-public rust-findshlibs-0.5 (package (name "rust-findshlibs") (version "0.5.0") @@ -853,24 +754,21 @@ representation.") (origin (method url-fetch) (uri (crate-uri "findshlibs" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1n2vagn0q5yim32hxkwi1cjgp3yn1dm45p7z8nw6lapywihhs9mi")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static) - ("rust-libc" ,rust-libc)))) (home-page "https://github.com/gimli-rs/findshlibs") (synopsis "Find the set of shared libraries loaded in the current process") (description "Find the set of shared libraries loaded in the current process with a cross platform API.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-fixedbitset +(define-public rust-fixedbitset-0.1 (package (name "rust-fixedbitset") (version "0.1.9") @@ -878,7 +776,7 @@ cross platform API.") (origin (method url-fetch) (uri (crate-uri "fixedbitset" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0czam11mi80dbyhf4rd4lz0ihcf7vkfchrdcrn45wbs0h40dxm46")))) @@ -886,10 +784,11 @@ cross platform API.") (home-page "https://github.com/petgraph/fixedbitset") (synopsis "FixedBitSet is a simple bitset collection") (description "FixedBitSet is a simple bitset collection.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-fnv +(define-public rust-fnv-1.0 (package (name "rust-fnv") (version "1.0.6") @@ -897,7 +796,7 @@ cross platform API.") (origin (method url-fetch) (uri (crate-uri "fnv" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1ww56bi1r5b8id3ns9j3qxbi7w5h005rzhiryy0zi9h97raqbb9g")))) @@ -906,10 +805,11 @@ cross platform API.") (synopsis "implementation of the Fowler-Noll-Vo hash function") (description "The @code{fnv} hash function is a custom @code{Hasher} implementation that is more efficient for smaller hash keys.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-foreign-types-shared +(define-public rust-foreign-types-shared-0.2 (package (name "rust-foreign-types-shared") (version "0.2.0") @@ -917,7 +817,7 @@ implementation that is more efficient for smaller hash keys.") (origin (method url-fetch) (uri (crate-uri "foreign-types-shared" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0kanxlif1vp0ffh2r9l610jqbkmb3183yqykxq1z5w1vay2rn7y6")))) @@ -926,10 +826,11 @@ implementation that is more efficient for smaller hash keys.") (synopsis "An internal crate used by foreign-types") (description "An internal crate used by foreign-types.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-fs-extra +(define-public rust-fs-extra-1.1 (package (name "rust-fs-extra") (version "1.1.0") @@ -937,7 +838,7 @@ implementation that is more efficient for smaller hash keys.") (origin (method url-fetch) (uri (crate-uri "fs_extra" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0x6675wdhsx277k1k1235jwcv38naf20d8kwrk948ds26hh4lajz")))) @@ -947,9 +848,10 @@ implementation that is more efficient for smaller hash keys.") (description "Expanding opportunities standard library @code{std::fs} and @code{std::io}. Recursively copy folders with recept information about process and much more.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-fuchsia-cprng +(define-public rust-fuchsia-cprng-0.1 (package (name "rust-fuchsia-cprng") (version "0.1.1") @@ -957,20 +859,19 @@ process and much more.") (origin (method url-fetch) (uri (crate-uri "fuchsia-cprng" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1fnkqrbz7ixxzsb04bsz9p0zzazanma8znfdqjvh39n14vapfvx0")))) (build-system cargo-build-system) - (arguments - `(#:tests? #f)) ; tests require zircon (home-page "https://fuchsia.googlesource.com/fuchsia/+/master/garnet/public/rust/fuchsia-cprng") (synopsis "Fuchsia cryptographically secure pseudorandom number generator") (description "Rust crate for the Fuchsia cryptographically secure pseudorandom number generator") + (properties '((hidden? . #t))) (license license:bsd-3))) -(define-public rust-fuchsia-zircon +(define-public rust-fuchsia-zircon-0.3 (package (name "rust-fuchsia-zircon") (version "0.3.3") @@ -978,22 +879,18 @@ pseudorandom number generator") (origin (method url-fetch) (uri (crate-uri "fuchsia-zircon" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "10jxc5ks1x06gpd0xg51kcjrxr35nj6qhx2zlc5n7bmskv3675rf")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-bitflags" ,rust-bitflags) - ("rust-fuchsia-zircon-sys" ,rust-fuchsia-zircon-sys)) - #:tests? #f)) ; tests require zircon (home-page "https://fuchsia.googlesource.com/garnet/") (synopsis "Rust bindings for the Zircon kernel") (description "Rust bindings for the Zircon kernel.") + (properties '((hidden? . #t))) (license license:bsd-3))) -(define-public rust-fuchsia-zircon-sys +(define-public rust-fuchsia-zircon-sys-0.3 (package (name "rust-fuchsia-zircon-sys") (version "0.3.3") @@ -1001,19 +898,18 @@ pseudorandom number generator") (origin (method url-fetch) (uri (crate-uri "fuchsia-zircon-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "19zp2085qsyq2bh1gvcxq1lb8w6v6jj9kbdkhpdjrl95fypakjix")))) (build-system cargo-build-system) - (arguments - `(#:tests? #f)) ; tests require zircon (home-page "https://fuchsia.googlesource.com/garnet/") (synopsis "Low-level Rust bindings for the Zircon kernel") (description "Low-level Rust bindings for the Zircon kernel.") + (properties '((hidden? . #t))) (license license:bsd-3))) -(define-public rust-futures +(define-public rust-futures-0.1 (package (name "rust-futures") (version "0.1.28") @@ -1021,7 +917,7 @@ pseudorandom number generator") (origin (method url-fetch) (uri (crate-uri "futures" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0saq8ffjw1pwf1pzhw3kq1z7dfq6wpd8x93dnni6vbkc799kkp25")))) @@ -1030,10 +926,11 @@ pseudorandom number generator") (synopsis "Implementation of zero-cost futures in Rust") (description "An implementation of @code{futures} and @code{streams} featuring zero allocations, composability, and iterator-like interfaces.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-futures-core-preview +(define-public rust-futures-core-preview-0.3 (package (name "rust-futures-core-preview") (version "0.3.0-alpha.17") @@ -1041,21 +938,20 @@ featuring zero allocations, composability, and iterator-like interfaces.") (origin (method url-fetch) (uri (crate-uri "futures-core-preview" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1xaq8m609k6cz8xydwhwp8xxyxigabcw1w9ngycfy0bnkg7iq52b")))) (build-system cargo-build-system) - (arguments - '(#:tests? #f)) ; The only tests are doc tests, which fail. (home-page "https://rust-lang-nursery.github.io/futures-rs/") (synopsis "Core traits and types in for the @code{futures} library.") (description "This crate provides the core traits and types in for the @code{futures} library.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-futures-cpupool +(define-public rust-futures-cpupool-0.1 (package (name "rust-futures-cpupool") (version "0.1.8") @@ -1063,24 +959,21 @@ featuring zero allocations, composability, and iterator-like interfaces.") (origin (method url-fetch) (uri (crate-uri "futures-cpupool" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1r32456gpblzfvnkf60545v8acqk7gh5zhyhi1jn669k9gicv45b")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-futures" ,rust-futures) - ("rust-num-cpus" ,rust-num-cpus)))) (home-page "https://github.com/rust-lang-nursery/futures-rs") (synopsis "Implementation of thread pools which hand out futures") (description "An implementation of thread pools which hand out futures to the results of the computation on the threads themselves.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-futures-io-preview +(define-public rust-futures-io-preview-0.3 (package (name "rust-futures-io-preview") (version "0.3.0-alpha.17") @@ -1088,7 +981,7 @@ the computation on the threads themselves.") (origin (method url-fetch) (uri (crate-uri "futures-io-preview" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0fhvwhdb8ywjjbfng0ra1r8yyc9yzpyxg9sv3spb3f7w0lk40bh8")))) @@ -1097,10 +990,11 @@ the computation on the threads themselves.") (synopsis "Async read and write traits for the futures library") (description "This crate provides the @code{AsyncRead} and @code{AsyncWrite} traits for the @code{futures-rs} library.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-futures-sink-preview +(define-public rust-futures-sink-preview-0.3 (package (name "rust-futures-sink-preview") (version "0.3.0-alpha.17") @@ -1108,63 +1002,45 @@ the computation on the threads themselves.") (origin (method url-fetch) (uri (crate-uri "futures-sink-preview" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1r4d0gy73hdxkh5g1lrhl1kjnwp6mywjgcj70v0z78b921da42a3")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-futures-core-preview" ,rust-futures-core-preview)))) (home-page "https://rust-lang-nursery.github.io/futures-rs/") (synopsis "Asynchronous `Sink` trait for the futures-rs library") (description "This package provides the asynchronous @code{Sink} trait for the futures-rs library.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-gcc +(define-public rust-gcc-0.3 (package - (inherit rust-cc) + (inherit rust-cc-1.0) (name "rust-gcc") (version "0.3.55") (source (origin (method url-fetch) (uri (crate-uri "gcc" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1hng1sajn4r67hndvhjysswz8niayjwvcj42zphpxzhbz89kjpwg")))) (build-system cargo-build-system) - (arguments - `(;#:cargo-inputs - ;(("rust-rayon" ,rust-rayon)) - #:cargo-development-inputs - (("rust-tempdir" ,rust-tempdir)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'remove-optional-deps - (lambda _ - (substitute* "Cargo.toml.orig" - ((".*optional.*") "\n") - ((".*features.*") "") - ((".*parallel.*") "")) - (delete-file "Cargo.toml") - (copy-file "Cargo.toml.orig" "Cargo.toml") - #t))) - #:tests? #f)) (home-page "https://github.com/alexcrichton/cc-rs") (synopsis "Library to compile C/C++ code into a Rust library/application") (description "This package provides a build-time dependency for Cargo build scripts to assist in invoking the native C compiler to compile native C code into a static archive to be linked into Rustcode.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-getopts +(define-public rust-getopts-0.2 (package (name "rust-getopts") (version "0.2.17") @@ -1172,21 +1048,19 @@ archive to be linked into Rustcode.") (origin (method url-fetch) (uri (crate-uri "getopts" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "018yhq97zgcrcxwhj3pxh31h83704sgaiijdnpl0r1ir366c005r")))) (build-system cargo-build-system) - (arguments - `(#:cargo-development-inputs - (("rust-log" ,rust-log)))) (home-page "https://github.com/rust-lang-nursery/getopts") (synopsis "Rust library for option parsing for CLI utilities") (description "This library provides getopts-like option parsing.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-glob +(define-public rust-glob-0.3 (package (name "rust-glob") (version "0.3.0") @@ -1194,56 +1068,35 @@ archive to be linked into Rustcode.") (origin (method url-fetch) (uri (crate-uri "glob" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0x25wfr7vg3mzxc9x05dcphvd3nwlcmbnxrvwcvrrdwplcrrk4cv")))) (build-system cargo-build-system) - (arguments - `(#:cargo-development-inputs - (("rust-tempdir" ,rust-tempdir)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-tests - ;; This test assumes /root exists but is unreadable by the user. - (lambda _ - (substitute* "src/lib.rs" - (("cfg\\(all\\(unix,.*") "cfg(windows)]\n")) - #t))))) (home-page "https://github.com/rust-lang-nursery/glob") (synopsis "Match file paths against Unix shell style patterns") (description "This package provides support for matching file paths against Unix shell style patterns.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) (define-public rust-glob-0.2 (package - (inherit rust-glob) + (inherit rust-glob-0.3) (name "rust-glob") (version "0.2.11") (source (origin (method url-fetch) (uri (crate-uri "glob" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1ysvi72slkw784fcsymgj4308c3y03gwjjzqxp80xdjnkbh8vqcb")))) - (arguments - `(#:cargo-development-inputs - (("rust-tempdir" ,rust-tempdir)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-tests - ;; This test assumes /root exists but is unreadable by the user. - (lambda _ - (substitute* "src/lib.rs" - (("cfg\\(unix") "cfg(windows")) - #t))))))) + "1ysvi72slkw784fcsymgj4308c3y03gwjjzqxp80xdjnkbh8vqcb")))))) -(define-public rust-heapsize +(define-public rust-heapsize-0.4 (package (name "rust-heapsize") (version "0.4.2") @@ -1251,43 +1104,36 @@ shell style patterns.") (origin (method url-fetch) (uri (crate-uri "heapsize" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0q94q9ppqjgrw71swiyia4hgby2cz6dldp7ij57nkvhd6zmfcy8n")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs (("rust-winapi" ,rust-winapi)) - ;; Tests assume rust is built with jemalloc. - ;; https://github.com/servo/heapsize/issues/74 - #:cargo-test-flags '("--features" "flexible-tests"))) (home-page "https://github.com/servo/heapsize") (synopsis "Measure the total runtime size of an object on the heap") (description "Infrastructure for measuring the total runtime size of an object on the heap.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) (define-public rust-heapsize-0.3 (package - (inherit rust-heapsize) + (inherit rust-heapsize-0.4) (name "rust-heapsize") (version "0.3.9") (source (origin (method url-fetch) (uri (crate-uri "heapsize" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0dmwc37vgsdjzk10443dj4f23439i9gch28jcwzmry3chrwx8v2m")))) - (arguments - `(#:cargo-inputs (("rust-kernel32-sys" ,rust-kernel32-sys)) - #:tests? #f)))) ;; No flexible-tests feature flags on this release. + "0dmwc37vgsdjzk10443dj4f23439i9gch28jcwzmry3chrwx8v2m")))))) ;; This package makes use of removed features -(define-public rust-heapsize-plugin +(define-public rust-heapsize-plugin-0.1 (package (name "rust-heapsize-plugin") (version "0.1.6") @@ -1295,20 +1141,11 @@ heap.") (origin (method url-fetch) (uri (crate-uri "heapsize_plugin" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1i72isf699q9jl167g2kg4xd6h3cd05rc79zaph58aqjy0g0m9y9")))) (build-system cargo-build-system) - (arguments - `(#:cargo-development-inputs (("rust-heapsize" ,rust-heapsize-0.3)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-Cargo-toml - (lambda _ - (substitute* "Cargo.toml" - (("path = \"..\", ") "")) - #t))))) (home-page "https://github.com/servo/heapsize") (synopsis "Measure runtime size of an object on the heap") (description @@ -1317,7 +1154,7 @@ total runtime size of an object on the heap") (properties `((hidden? . #t))) (license license:mpl2.0))) -(define-public rust-hex +(define-public rust-hex-0.3 (package (name "rust-hex") (version "0.3.2") @@ -1325,7 +1162,7 @@ total runtime size of an object on the heap") (origin (method url-fetch) (uri (crate-uri "hex" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0xsdcjiik5j750j67zk42qdnmm4ahirk3gmkmcqgq7qls2jjcl40")))) @@ -1334,10 +1171,11 @@ total runtime size of an object on the heap") (synopsis "Encode and decode data to/from hexadecimals") (description "This crate allows for encoding and decoding data into/from hexadecimal representation.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-hostname +(define-public rust-hostname-0.1 (package (name "rust-hostname") (version "0.1.5") @@ -1345,22 +1183,19 @@ hexadecimal representation.") (origin (method url-fetch) (uri (crate-uri "hostname" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0kprf862qaa7lwdms6aw7f3275h0j2rwhs9nz5784pm8hdmb9ki1")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc) - ("rust-winutil" ,rust-winutil)))) (home-page "https://github.com/fengcen/hostname") (synopsis "Get hostname for Rust") (description "Get hostname for Rust.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-iovec +(define-public rust-iovec-0.1 (package (name "rust-iovec") (version "0.1.2") @@ -1368,23 +1203,20 @@ hexadecimal representation.") (origin (method url-fetch) (uri (crate-uri "iovec" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "025vi072m22299z3fg73qid188z2iip7k41ba6v5v5yhwwby9rnv")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc) - ("rust-winapi" ,rust-winapi-0.2)))) (home-page "https://github.com/carllerche/iovec") (synopsis "Portable buffer type for scatter/gather I/O operations") (description "Portable buffer type for scatter/gather I/O operations.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-itoa +(define-public rust-itoa-0.4 (package (name "rust-itoa") (version "0.4.4") @@ -1392,7 +1224,7 @@ hexadecimal representation.") (origin (method url-fetch) (uri (crate-uri "itoa" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0zvg2d9qv3avhf3d8ggglh6fdyw8kkwqg3r4622ly5yhxnvnc4jh")))) @@ -1401,24 +1233,25 @@ hexadecimal representation.") (synopsis "Fast functions for printing integer primitives") (description "This crate provides fast functions for printing integer primitives to an @code{io::Write}.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) (define-public rust-itoa-0.1 (package - (inherit rust-itoa) + (inherit rust-itoa-0.4) (name "rust-itoa") (version "0.1.1") (source (origin (method url-fetch) (uri (crate-uri "itoa" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "18g7p2hrb3dk84z3frfgmszfc9hjb4ps9vp99qlb1kmf9gm8hc5f")))))) -(define-public rust-jemalloc-sys +(define-public rust-jemalloc-sys-0.3 (package (name "rust-jemalloc-sys") (version "0.3.2") @@ -1426,34 +1259,31 @@ primitives to an @code{io::Write}.") (origin (method url-fetch) (uri (crate-uri "jemalloc-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0ify9vlql01qhfxlj7d4p9jvcp90mj2h69nkbq7slccvbhzryfqd")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc) - ("rust-cc" ,rust-cc) - ("rust-fs-extra" ,rust-fs-extra)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'override-jemalloc - (lambda* (#:key inputs #:allow-other-keys) - (let ((jemalloc (assoc-ref inputs "jemalloc"))) - (delete-file-recursively "jemalloc") - (setenv "JEMALLOC_OVERRIDE" - (string-append jemalloc "/lib/libjemalloc_pic.a"))) - #t))))) - (inputs - `(("jemalloc" ,jemalloc))) + ;(arguments + ; `(#:phases + ; (modify-phases %standard-phases + ; (add-after 'unpack 'override-jemalloc + ; (lambda* (#:key inputs #:allow-other-keys) + ; (let ((jemalloc (assoc-ref inputs "jemalloc"))) + ; (delete-file-recursively "jemalloc") + ; (setenv "JEMALLOC_OVERRIDE" + ; (string-append jemalloc "/lib/libjemalloc_pic.a"))) + ; #t))))) + ;(inputs + ; `(("jemalloc" ,jemalloc))) (home-page "https://github.com/gnzlbg/jemallocator") (synopsis "Rust FFI bindings to jemalloc") (description "This package provides Rust FFI bindings to jemalloc.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-json +(define-public rust-json-0.11 (package (name "rust-json") (version "0.11.14") @@ -1461,7 +1291,7 @@ primitives to an @code{io::Write}.") (origin (method url-fetch) (uri (crate-uri "json" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1hj8c6xj5c2aqqszi8naaflmcdbya1i9byyjrq4iybxjb4q91mq1")))) @@ -1470,10 +1300,11 @@ primitives to an @code{io::Write}.") (synopsis "JSON implementation in Rust") (description "This crate provides a JSON implementation in Rust, reducing friction with idiomatic Rust structs to ease interopability.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-kernel32-sys +(define-public rust-kernel32-sys-0.2 (package (name "rust-kernel32-sys") (version "0.2.2") @@ -1481,29 +1312,19 @@ friction with idiomatic Rust structs to ease interopability.") (origin (method url-fetch) (uri (crate-uri "kernel32-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1389av0601a9yz8dvx5zha9vmkd6ik7ax0idpb032d28555n41vm")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-winapi" ,rust-winapi-0.2) - ("rust-winapi-build" ,rust-winapi-build)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-Cargo-toml - (lambda _ - (substitute* "Cargo.toml" - ((", path =.* }") "}\n")) - #t))))) (home-page "https://github.com/retep998/winapi-rs") (synopsis "Function definitions for the Windows API library kernel32") (description "Contains function definitions for the Windows API library kernel32.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-language-tags +(define-public rust-language-tags-0.2 (package (name "rust-language-tags") (version "0.2.2") @@ -1511,16 +1332,11 @@ kernel32.") (origin (method url-fetch) (uri (crate-uri "language-tags" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "16hrjdpa827carq5x4b8zhas24d8kg4s16m6nmmn1kb7cr5qh7d9")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-heapsize" ,rust-heapsize-0.3)) - #:cargo-development-inputs - (("rust-heapsize-plugin" ,rust-heapsize-plugin)))) (home-page "https://github.com/pyfisch/rust-language-tags") (synopsis "Language tags for Rust") (description @@ -1529,9 +1345,10 @@ script, countries and other regions. They are commonly used in HTML and HTTP @code{Content-Language} and @code{Accept-Language} header fields. This package currently supports parsing (fully conformant parser), formatting and comparing language tags.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-lazy-static +(define-public rust-lazy-static-1.3 (package (name "rust-lazy-static") (version "1.3.0") @@ -1539,13 +1356,11 @@ language tags.") (origin (method url-fetch) (uri (crate-uri "lazy_static" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "052ac27w189hrf1j3hz7sga46rp84zl2hqnzyihxv78mgzr2jmxw")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs (("rust-spin" ,rust-spin)))) (home-page "https://github.com/rust-lang-nursery/lazy-static.rs") (synopsis "Macro for declaring lazily evaluated statics in Rust") (description @@ -1554,10 +1369,11 @@ Rust. Using this macro, it is possible to have @code{static}s that require code to be executed at runtime in order to be initialized. This includes anything requiring heap allocations, like vectors or hash maps, as well as anything that requires non-const function calls to be computed.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-libc +(define-public rust-libc-0.2 (package (name "rust-libc") (version "0.2.62") @@ -1566,14 +1382,11 @@ requires non-const function calls to be computed.") (method url-fetch) (uri (crate-uri "libc" version)) (file-name - (string-append name "-" version ".tar.gz")) + (string-append name "-" version ".crate")) (sha256 (base32 "1fh69kpjg8hqff36kdczx7sax98gk4qs4ws1dwvjz0rgip0d5z1l")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core)))) (home-page "https://github.com/rust-lang/libc") (synopsis "Raw FFI bindings to platform libraries like libc") (description @@ -1586,10 +1399,11 @@ This crate exports all underlying platform types, functions, and constants under the crate root, so all items are accessible as @samp{libc::foo}. The types and values of all the exported APIs match the platform that libc is compiled for.") + (properties '((hidden? . #t))) (license (list license:expat license:asl2.0)))) -(define-public rust-libgit2-sys +(define-public rust-libgit2-sys-0.8 (package (name "rust-libgit2-sys") (version "0.8.2") @@ -1597,72 +1411,52 @@ the platform that libc is compiled for.") (origin (method url-fetch) (uri (crate-uri "libgit2-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0y2mibmx7wy91s2kmb2gfb29mrqlqaxpy5wcwr8s1lwws7b9w5sc")) )) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc) - ("rust-libssh2-sys" ,rust-libssh2-sys) - ("rust-libz-sys" ,rust-libz-sys) - ("rust-openssl-sys" ,rust-openssl-sys)) - #:cargo-development-inputs - (("rust-cc" ,rust-cc) - ("rust-pkg-config" ,rust-pkg-config)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'find-openssl - (lambda* (#:key inputs #:allow-other-keys) - (let ((openssl (assoc-ref inputs "openssl"))) - (setenv "OPENSSL_DIR" openssl)) - (delete-file-recursively "libgit2") - (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1") - (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1") - #t))))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("libgit2" ,libgit2) - ("openssl" ,openssl) - ("zlib" ,zlib))) + ;(arguments + ; `(#:phases + ; (modify-phases %standard-phases + ; (add-after 'unpack 'find-openssl + ; (lambda* (#:key inputs #:allow-other-keys) + ; (let ((openssl (assoc-ref inputs "openssl"))) + ; (setenv "OPENSSL_DIR" openssl)) + ; (delete-file-recursively "libgit2") + ; (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1") + ; (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1") + ; #t))))) + ;(native-inputs + ; `(("pkg-config" ,pkg-config))) + ;(inputs + ; `(("libgit2" ,libgit2) + ; ("openssl" ,openssl) + ; ("zlib" ,zlib))) (home-page "https://github.com/rust-lang/git2-rs") (synopsis "Native bindings to the libgit2 library") (description "This package provides native rust bindings to the @code{libgit2} library.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) (define-public rust-libgit2-sys-0.7 (package - (inherit rust-libgit2-sys) + (inherit rust-libgit2-sys-0.8) (name "rust-libgit2-sys") (version "0.7.11") (source (origin (method url-fetch) (uri (crate-uri "libgit2-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1wcvg2qqra2aviasvqcscl8gb2rnjnd6h998wy5dlmf2bnriqi28")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-curl-sys" ,rust-curl-sys) - ("rust-libc" ,rust-libc) - ("rust-libssh2-sys" ,rust-libssh2-sys) - ("rust-libz-sys" ,rust-libz-sys) - ("rust-openssl-sys" ,rust-openssl-sys)) - #:cargo-development-inputs - (("rust-cc" ,rust-cc) - ("rust-pkg-config" ,rust-pkg-config)))) - (inputs - `(("curl" ,curl) - ,@(package-inputs rust-libgit2-sys))))) - -(define-public rust-libloading + (build-system cargo-build-system))) + +(define-public rust-libloading-0.5 (package (name "rust-libloading") (version "0.5.2") @@ -1670,15 +1464,11 @@ the platform that libc is compiled for.") (origin (method url-fetch) (uri (crate-uri "libloading" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0lyply8rcqc8agajzxs7bq6ivba9dnn1i68kgb9z2flnfjh13cgj")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-cc" ,rust-cc) - ("rust-winapi" ,rust-winapi)))) (home-page "https://github.com/nagisa/rust_libloading/") (synopsis "Rust library for loading dynamic libraries") (description @@ -1687,9 +1477,10 @@ The most important safety guarantee by this library is prevention of dangling-Symbols that may occur after a Library is unloaded. Using this library allows loading dynamic libraries (also known as shared libraries) as well as use functions and static variables these libraries contain.") + (properties '((hidden? . #t))) (license license:isc))) -(define-public rust-libssh2-sys +(define-public rust-libssh2-sys-0.2 (package (name "rust-libssh2-sys") (version "0.2.12") @@ -1697,45 +1488,37 @@ functions and static variables these libraries contain.") (origin (method url-fetch) (uri (crate-uri "libssh2-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1zb6gsw795nq848nk5x2smzpfnn1s15wjlzjnvr8ihlz2l5x2549")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc) - ("rust-libz-sys" ,rust-libz-sys) - ("rust-openssl-sys" ,rust-openssl-sys)) - #:cargo-development-inputs - (("rust-cc" ,rust-cc) - ("rust-openssl-src" ,rust-openssl-src) - ("rust-pkg-config" ,rust-pkg-config) - ("rust-vcpkg" ,rust-vcpkg)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'find-openssl - (lambda* (#:key inputs #:allow-other-keys) - (let ((openssl (assoc-ref inputs "openssl"))) - (setenv "OPENSSL_DIR" openssl)) - (delete-file-recursively "libssh2") - (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1") - #t))))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("libssh2" ,libssh2) - ("openssl" ,openssl) - ("zlib" ,zlib))) + ;(arguments + ; `(#:phases + ; (modify-phases %standard-phases + ; (add-after 'unpack 'find-openssl + ; (lambda* (#:key inputs #:allow-other-keys) + ; (let ((openssl (assoc-ref inputs "openssl"))) + ; (setenv "OPENSSL_DIR" openssl)) + ; (delete-file-recursively "libssh2") + ; (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1") + ; #t))))) + ;(native-inputs + ; `(("pkg-config" ,pkg-config))) + ;(inputs + ; `(("libssh2" ,libssh2) + ; ("openssl" ,openssl) + ; ("zlib" ,zlib))) (home-page "https://github.com/alexcrichton/ssh2-rs") (synopsis "Native bindings to the libssh2 library") (description "This package provides native rust bindings to the @code{libssh2} library.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-lock-api +(define-public rust-lock-api-0.1 (package (name "rust-lock-api") (version "0.1.5") @@ -1743,24 +1526,21 @@ functions and static variables these libraries contain.") (origin (method url-fetch) (uri (crate-uri "lock_api" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0b24q9mh258xa52ap636q1sxz0j5vrnp0hwbbh7ddjka3wwz3sv2")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-owning-ref" ,rust-owning-ref) - ("rust-scopeguard" ,rust-scopeguard-0.3)))) (home-page "https://github.com/Amanieu/parking_lot") (synopsis "Wrappers to create fully-featured Mutex and RwLock types") (description "This package provides wrappers to create fully-featured @code{Mutex} and @code{RwLock} types. It is compatible with @code{no_std}.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-log +(define-public rust-log-0.3 (package (name "rust-log") (version "0.3.8") @@ -1768,7 +1548,7 @@ functions and static variables these libraries contain.") (origin (method url-fetch) (uri (crate-uri "log" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0nsn28syc49vvjhxcfc8261rd1frhjc0r4bn9v3mqvps3ra7f3w8")))) @@ -1777,10 +1557,11 @@ functions and static variables these libraries contain.") (synopsis "Lightweight logging") (description "This package provides a lightweight logging facade for Rust") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-lzma-sys +(define-public rust-lzma-sys-0.1 (package (name "rust-lzma-sys") (version "0.1.15") @@ -1788,35 +1569,32 @@ functions and static variables these libraries contain.") (origin (method url-fetch) (uri (crate-uri "lzma-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "14gyj256yh0wm77jbvmlc39v7lfn0navpfrja4alczarzlc8ir2k")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-cc" ,rust-cc) - ("rust-libc" ,rust-libc) - ("rust-pkg-config" ,rust-pkg-config)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'unbundle-xz - (lambda* (#:key inputs #:allow-other-keys) - (let ((xz (assoc-ref inputs "xz"))) - (delete-file-recursively "xz-5.2")) - #t))))) - (inputs - `(("pkg-config" ,pkg-config) - ("xz" ,xz))) + ;(arguments + ; `(#:phases + ; (modify-phases %standard-phases + ; (add-after 'unpack 'unbundle-xz + ; (lambda* (#:key inputs #:allow-other-keys) + ; (let ((xz (assoc-ref inputs "xz"))) + ; (delete-file-recursively "xz-5.2")) + ; #t))))) + ;(inputs + ; `(("pkg-config" ,pkg-config) + ; ("xz" ,xz))) (home-page "https://github.com/alexcrichton/xz2-rs") (synopsis "Bindings to liblzma for lzma and xz stream encoding/decoding") (description "This package contains the raw bindings to liblzma which contains an implementation of LZMA and xz stream encoding/decoding.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-maplit +(define-public rust-maplit-1.0 (package (name "rust-maplit") (version "1.0.1") @@ -1824,7 +1602,7 @@ implementation of LZMA and xz stream encoding/decoding.") (origin (method url-fetch) (uri (crate-uri "maplit" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0hsczmvd6zkqgzqdjp5hfyg7f339n68w83n4pxvnsszrzssbdjq8")))) @@ -1833,10 +1611,11 @@ implementation of LZMA and xz stream encoding/decoding.") (synopsis "Collection of Map macros") (description "This crate provides a collection of @code{literal} macros for @code{HashMap}, @code{HashSet}, @code{BTreeMap}, and @code{BTreeSet.}") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-matches +(define-public rust-matches-0.1 (package (name "rust-matches") (version "0.1.8") @@ -1844,7 +1623,7 @@ implementation of LZMA and xz stream encoding/decoding.") (origin (method url-fetch) (uri (crate-uri "matches" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "020axl4q7rk9vz90phs7f8jas4imxal9y9kxl4z4v7a6719mrz3z")))) @@ -1853,9 +1632,10 @@ implementation of LZMA and xz stream encoding/decoding.") (synopsis "Macro to evaluate whether an expression matches a pattern.") (description "This package provides a macro to evaluate, as a boolean, whether an expression matches a pattern.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-md5 +(define-public rust-md5-0.6 (package (name "rust-md5") (version "0.6.1") @@ -1863,7 +1643,7 @@ whether an expression matches a pattern.") (origin (method url-fetch) (uri (crate-uri "md5" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "17b2xm4h4cvxsdjsf3kdrzqv2za60kak961xzi5kmw6g6djcssvy")))) @@ -1871,10 +1651,11 @@ whether an expression matches a pattern.") (home-page "https://github.com/stainless-steel/md5") (synopsis "MD5 hash function in Rust") (description "The package provides the MD5 hash function.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-memmap +(define-public rust-memmap-0.7 (package (name "rust-memmap") (version "0.7.0") @@ -1882,46 +1663,35 @@ whether an expression matches a pattern.") (origin (method url-fetch) (uri (crate-uri "memmap" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0ns7kkd1h4pijdkwfvw4qlbbmqmlmzwlq3g2676dcl5vwyazv1b5")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc) - ("rust-winapi" ,rust-winapi)) - #:cargo-development-inputs - (("rust-tempdir" ,rust-tempdir)))) (home-page "https://github.com/danburkert/memmap-rs") (synopsis "Rust library for cross-platform memory mapped IO") (description "This package provides a cross-platform Rust API for memory-mapped file IO.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) (define-public rust-memmap-0.6 (package - (inherit rust-memmap) + (inherit rust-memmap-0.7) (name "rust-memmap") (version "0.6.2") (source (origin (method url-fetch) (uri (crate-uri "memmap" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1zy6s0ni0lx9rjzq3gq2zz9r8zgjmbp02332g3gsj4fyhv4s5zz2")))) - (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc) - ("rust-winapi" ,rust-winapi)) - #:cargo-development-inputs - (("rust-tempdir" ,rust-tempdir)))))) + "1zy6s0ni0lx9rjzq3gq2zz9r8zgjmbp02332g3gsj4fyhv4s5zz2")))))) -(define-public rust-mime +(define-public rust-mime-0.3 (package (name "rust-mime") (version "0.3.13") @@ -1929,22 +1699,20 @@ file IO.") (origin (method url-fetch) (uri (crate-uri "mime" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "09clbyvdkwflp8anwjhqdib0sw8191gphcchdp80nc8ayhhwl9ry")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-unicase" ,rust-unicase)))) (home-page "https://github.com/hyperium/mime") (synopsis "Strongly Typed Mimes") (description "Support MIME (HTTP Media Types) as strong types in Rust.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-miniz-oxide +(define-public rust-miniz-oxide-0.3 (package (name "rust-miniz-oxide") (version "0.3.3") @@ -1952,29 +1720,20 @@ file IO.") (origin (method url-fetch) (uri (crate-uri "miniz_oxide" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1bmanbbcdmssfbgik3fs323g7vljc5wkjz7s61jsbbz2kg0nckrh")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-adler32" ,rust-adler32)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-tests - (lambda _ - (substitute* "tests/test.rs" - (("../miniz/miniz.c") "Cargo.toml")) - #t))))) (home-page "https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide") (synopsis "Pure rust replacement for the miniz DEFLATE/zlib encoder/decoder") (description "A pure rust replacement for the miniz DEFLATE/zlib encoder/decoder. Using @code{flate2} with the @code{rust_backend} feature provides an easy to use streaming API for miniz_oxide.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-miniz-sys +(define-public rust-miniz-sys-0.1 (package (name "rust-miniz-sys") (version "0.1.12") @@ -1982,23 +1741,20 @@ streaming API for miniz_oxide.") (origin (method url-fetch) (uri (crate-uri "miniz-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "00l2r4anm8g35x0js2zfdnwfbrih9m43vphdpb77c5ga3kjkm7hy")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-cc" ,rust-cc) - ("rust-libc" ,rust-libc)))) (home-page "https://github.com/alexcrichton/flate2-rs") (synopsis "Bindings to the miniz.c library") (description "This package provides bindings to the @code{miniz.c} library.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-miow +(define-public rust-miow-0.3 (package (name "rust-miow") (version "0.3.3") @@ -2006,48 +1762,35 @@ streaming API for miniz_oxide.") (origin (method url-fetch) (uri (crate-uri "miow" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "09ljvx6wg30f2xlv7b7hhpkw7k312n3hjgmrbhwzhz9x03ra0sir")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-socket2" ,rust-socket2) - ("rust-winapi" ,rust-winapi)) - #:cargo-development-inputs - (("rust-rand" ,rust-rand)))) (home-page "https://github.com/alexcrichton/miow") (synopsis "Rust I/O library for Windows") (description "This package provides a zero overhead I/O library for Windows, focusing on IOCP and Async I/O abstractions.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) (define-public rust-miow-0.2 (package - (inherit rust-miow) + (inherit rust-miow-0.3) (name "rust-miow") (version "0.2.1") (source (origin (method url-fetch) (uri (crate-uri "miow" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "06g9b8sqlh5gxakwqq4rrib07afwanfnxgxajrldwcgk3hxjy7wc")))) - (arguments - `(#:cargo-inputs - (("rust-kernel32-sys" ,rust-kernel32-sys) - ("rust-net2" ,rust-net2) - ("rust-winapi" ,rust-winapi-0.2) - ("rust-ws2-32-sys" ,rust-ws2-32-sys)) - #:cargo-development-inputs - (("rust-rand" ,rust-rand-0.3)))))) + "06g9b8sqlh5gxakwqq4rrib07afwanfnxgxajrldwcgk3hxjy7wc")))))) -(define-public rust-modifier +(define-public rust-modifier-0.1 (package (name "rust-modifier") (version "0.1.0") @@ -2055,7 +1798,7 @@ IOCP and Async I/O abstractions.") (origin (method url-fetch) (uri (crate-uri "modifier" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0n3fmgli1nsskl0whrfzm1gk0rmwwl6pw1q4nb9sqqmn5h8wkxa1")))) @@ -2065,9 +1808,10 @@ IOCP and Async I/O abstractions.") "Chaining APIs for both self -> Self and &mut self methods.") (description "Chaining APIs for both self -> Self and &mut self methods.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-net2 +(define-public rust-net2-0.2 (package (name "rust-net2") (version "0.2.33") @@ -2075,25 +1819,21 @@ IOCP and Async I/O abstractions.") (origin (method url-fetch) (uri (crate-uri "net2" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "126g3fgfxp06zimc1l9iyxnn9cif1hjsg7sd81nlls5nnyghsma2")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-cfg-if" ,rust-cfg-if) - ("rust-libc" ,rust-libc) - ("rust-winapi" ,rust-winapi)))) (home-page "https://github.com/rust-lang-nursery/net2-rs") (synopsis "Extensions to the standard library's networking types") (description "This library contains extensions to the standard library's networking types as proposed in RFC 1158.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-netlib-src +(define-public rust-netlib-src-0.7 (package (name "rust-netlib-src") (version "0.7.4") @@ -2101,35 +1841,23 @@ types as proposed in RFC 1158.") (origin (method url-fetch) (uri (crate-uri "netlib-src" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "112hwfw1zzdj10h3j213xxqjrq38iygb3nb3ijay65ycmrg819s4")))) (build-system cargo-build-system) - (arguments - `(#:cargo-development-inputs - (("rust-cmake" ,rust-cmake) - ("rust-libc" ,rust-libc)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'use-system-lapack - (lambda _ - (delete-file-recursively "source") - (substitute* "Cargo.toml" - (("default .*") - "default = [\"system\"]\n")) - #t))))) - (inputs - `(("gfortran:lib" ,gfortran "lib") - ("lapack" ,lapack))) + ;(inputs + ; `(("gfortran:lib" ,gfortran "lib") + ; ("lapack" ,lapack))) (home-page "https://github.com/blas-lapack-rs/netlib-src") (synopsis "Source of BLAS and LAPACK via Netlib") (description "The package provides a source of BLAS and LAPACK via Netlib.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-libnghttp2-sys +(define-public rust-libnghttp2-sys-0.1 (package (name "rust-libnghttp2-sys") (version "0.1.2") @@ -2137,26 +1865,22 @@ types as proposed in RFC 1158.") (origin (method url-fetch) (uri (crate-uri "libnghttp2-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0qr4lyh7righx9n22c7amlcpk906rn1jnb2zd6gdfpa3yi24s982")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc)) - #:cargo-development-inputs - (("rust-cc" ,rust-cc)))) - (inputs - `(("nghttp2" ,nghttp2))) + ;(inputs + ; `(("nghttp2" ,nghttp2))) (home-page "https://github.com/alexcrichton/nghttp2-rs") (synopsis "FFI bindings for libnghttp2 (nghttp2)") (description "This package provides FFI bindings for libnghttp2 (nghttp2).") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-libz-sys +(define-public rust-libz-sys-1.0 (package (name "rust-libz-sys") (version "1.0.25") @@ -2164,35 +1888,31 @@ types as proposed in RFC 1158.") (origin (method url-fetch) (uri (crate-uri "libz-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1gjycyl2283525abks98bhxa4r259m617xfm5z52p3p3c8ry9d9f")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc) - ("rust-cc" ,rust-cc) - ("rust-pkg-config" ,rust-pkg-config) - ("rust-vcpkg" ,rust-vcpkg)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'delete-vendored-zlib - (lambda _ - (delete-file-recursively "src/zlib") - #t))))) - (inputs - `(("pkg-config" ,pkg-config) - ("zlib" ,zlib))) + ;(arguments + ; `(#:phases + ; (modify-phases %standard-phases + ; (add-after 'unpack 'delete-vendored-zlib + ; (lambda _ + ; (delete-file-recursively "src/zlib") + ; #t))))) + ;(inputs + ; `(("pkg-config" ,pkg-config) + ; ("zlib" ,zlib))) (home-page "https://github.com/rust-lang/libz-sys") (synopsis "Bindings to the system libz library") (description "This package provides bindings to the system @code{libz} library (also known as zlib).") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-nodrop +(define-public rust-nodrop-0.1 (package (name "rust-nodrop") (version "0.1.13") @@ -2200,24 +1920,22 @@ known as zlib).") (origin (method url-fetch) (uri (crate-uri "nodrop" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0if9ifn6rvar5jirx4b3qh4sl5kjkmcifycvzhxa9j3crkfng5ig")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-nodrop-union" ,rust-nodrop-union)))) (home-page "https://github.com/bluss/arrayvec") (synopsis "Wrapper type to inhibit drop (destructor)") (description "This package provides a wrapper type to inhibit drop (destructor). Use @code{std::mem::ManuallyDrop} instead!") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) ;; This package requires features which are unavailable ;; on the stable releases of Rust. -(define-public rust-nodrop-union +(define-public rust-nodrop-union-0.1 (package (name "rust-nodrop-union") (version "0.1.10") @@ -2225,7 +1943,7 @@ known as zlib).") (origin (method url-fetch) (uri (crate-uri "nodrop-union" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0jsnkdn9l8jlmb9h4wssi76sxnyxwnyi00p6y1p2gdq7c1gdw2b7")))) @@ -2239,7 +1957,7 @@ implementation (which is unstable / requires nightly).") (license (list license:asl2.0 license:expat)))) -(define-public rust-num-cpus +(define-public rust-num-cpus-1.10 (package (name "rust-num-cpus") (version "1.10.1") @@ -2247,24 +1965,20 @@ implementation (which is unstable / requires nightly).") (origin (method url-fetch) (uri (crate-uri "num_cpus" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0wrj3zvj6h3q26sqj9zxpd59frjb54n7jhjwf307clq31ic47vxw")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc)) - #:cargo-development-inputs - (("rust-doc-comment" ,rust-doc-comment)))) (home-page "https://github.com/seanmonstar/num_cpus") (synopsis "Get the number of CPUs on a machine") (description "Get the number of CPUs on a machine.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-num-integer +(define-public rust-num-integer-0.1 (package (name "rust-num-integer") (version "0.1.41") @@ -2273,23 +1987,20 @@ implementation (which is unstable / requires nightly).") (method url-fetch) (uri (crate-uri "num-integer" version)) (file-name - (string-append name "-" version ".tar.gz")) + (string-append name "-" version ".crate")) (sha256 (base32 "02dwjjpfbi16c71fq689s4sw3ih52cvfzr5z5gs6qpr5z0g58pmq")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-autocfg" ,rust-autocfg) - ("rust-num-traits" ,rust-num-traits)))) (home-page "https://github.com/rust-num/num-integer") (synopsis "Integer traits and functions") (description "Integer traits and functions.") + (properties '((hidden? . #t))) ;; Dual licensed. (license (list license:asl2.0 license:expat)))) -(define-public rust-num-iter +(define-public rust-num-iter-0.1 (package (name "rust-num-iter") (version "0.1.39") @@ -2297,25 +2008,20 @@ implementation (which is unstable / requires nightly).") (origin (method url-fetch) (uri (crate-uri "num-iter" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0bhk2qbr3261r6zvfc58lz4spfqjhvdripxgz5mks5rd85r55gbn")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-num-integer" ,rust-num-integer) - ("rust-num-traits" ,rust-num-traits)) - #:cargo-development-inputs - (("rust-autocfg" ,rust-autocfg)))) (home-page "https://github.com/rust-num/num-iter") (synopsis "External iterators for generic mathematics") (description "This crate provides external iterators for generic mathematics.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-num-traits +(define-public rust-num-traits-0.2 (package (name "rust-num-traits") (version "0.2.8") @@ -2324,40 +2030,35 @@ implementation (which is unstable / requires nightly).") (method url-fetch) (uri (crate-uri "num-traits" version)) (file-name - (string-append name "-" version ".tar.gz")) + (string-append name "-" version ".crate")) (sha256 (base32 "0clvrm34rrqc8p6gq5ps5fcgws3kgq5knh7nlqxf2ayarwks9abb")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-autocfg" ,rust-autocfg)))) (home-page "https://github.com/rust-num/num-traits") (synopsis "Numeric traits for generic mathematics") (description "Numeric traits for generic mathematics.") + (properties '((hidden? . #t))) ;; Dual licensed. (license (list license:asl2.0 license:expat)))) (define-public rust-num-traits-0.1 (package - (inherit rust-num-traits) + (inherit rust-num-traits-0.2) (name "rust-num-traits") (version "0.1.43") (source (origin (method url-fetch) (uri (crate-uri "num-traits" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0c9whknf2dm74a3cqirafy6gj83a76gl56g4v3g19k6lkwz13rcj")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-num-traits" ,rust-num-traits)))))) + (build-system cargo-build-system))) -(define-public rust-openssl-probe +(define-public rust-openssl-probe-0.1 (package (name "rust-openssl-probe") (version "0.1.2") @@ -2365,7 +2066,7 @@ implementation (which is unstable / requires nightly).") (origin (method url-fetch) (uri (crate-uri "openssl-probe" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1pijrdifgsdwd45b08c2g0dsmnhz7c3kmagb70839ngrd7d29bvp")))) @@ -2375,10 +2076,11 @@ implementation (which is unstable / requires nightly).") (description "This package provides a tool to find SSL certificate locations on the system for OpenSSL.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-openssl-src +(define-public rust-openssl-src-111 (package (name "rust-openssl-src") (version "111.6.0+1.1.1d") @@ -2386,21 +2088,20 @@ system for OpenSSL.") (origin (method url-fetch) (uri (crate-uri "openssl-src" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "172xh95hp7aygahah1940kg1dnx60c5m80cwj5hgi8x7x0fxmhmr")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs (("rust-cc" ,rust-cc)))) (home-page "https://github.com/alexcrichton/openssl-src-rs") (synopsis "Source of OpenSSL for rust crates") (description "This package contains the source of OpenSSL and logic to build it.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-openssl-sys +(define-public rust-openssl-sys-0.9 (package (name "rust-openssl-sys") (version "0.9.50") @@ -2408,37 +2109,29 @@ system for OpenSSL.") (origin (method url-fetch) (uri (crate-uri "openssl-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1dn3capgiz77s6rpmc2sf8gadwkmhwgfd6mw4rcnnm9jp36dqhic")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-autocfg" ,rust-autocfg) - ("rust-libc" ,rust-libc)) - #:cargo-development-inputs - (("rust-autocfg" ,rust-autocfg) - ("rust-cc" ,rust-cc) - ("rust-openssl-src" ,rust-openssl-src) - ("rust-pkg-config" ,rust-pkg-config) - ("rust-vcpkg" ,rust-vcpkg)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'find-openssl - (lambda* (#:key inputs #:allow-other-keys) - (let ((openssl (assoc-ref inputs "openssl"))) - (setenv "OPENSSL_DIR" openssl)) - #t))))) - (inputs - `(("openssl" ,openssl) - ("pkg-config" ,pkg-config))) + ;(arguments + ; `(#:phases + ; (modify-phases %standard-phases + ; (add-after 'unpack 'find-openssl + ; (lambda* (#:key inputs #:allow-other-keys) + ; (let ((openssl (assoc-ref inputs "openssl"))) + ; (setenv "OPENSSL_DIR" openssl)) + ; #t))))) + ;(inputs + ; `(("openssl" ,openssl) + ; ("pkg-config" ,pkg-config))) (home-page "https://github.com/sfackler/rust-openssl") (synopsis "FFI bindings to OpenSSL") (description "This package provides FFI bindings to OpenSSL for use in rust crates.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-owning-ref +(define-public rust-owning-ref-0.4 (package (name "rust-owning-ref") (version "0.4.0") @@ -2446,23 +2139,21 @@ system for OpenSSL.") (origin (method url-fetch) (uri (crate-uri "owning_ref" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "04zgwy77lin8qz398s6g44467pd6kjhbrlqifkia5rkr47mbi929")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-stable-deref-trait" ,rust-stable-deref-trait)))) (home-page "https://github.com/Kimundi/owning-ref-rs") (synopsis "Create references that carry their owner with them") (description "This package provides a library for creating references that carry their owner with them. This can sometimes be useful because Rust borrowing rules normally prevent moving a type that has been borrowed from.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-parity-wasm +(define-public rust-parity-wasm-0.40 (package (name "rust-parity-wasm") (version "0.40.1") @@ -2470,24 +2161,21 @@ normally prevent moving a type that has been borrowed from.") (origin (method url-fetch) (uri (crate-uri "parity-wasm" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1p84f0k36q05j18jy66n122lyali794cj78hbxgy9wj6si84plqd")))) (build-system cargo-build-system) - (arguments - `(#:cargo-development-inputs - (("rust-time" ,rust-time)) - #:tests? #f)) ; Test files are not included in release. (home-page "https://github.com/paritytech/parity-wasm") (synopsis "Low-level WebAssembly format library") (description "This package provides a WebAssembly binary format serialization, deserialization, and interpreter in Rust.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-peeking-take-while +(define-public rust-peeking-take-while-0.1 (package (name "rust-peeking-take-while") (version "0.1.2") @@ -2495,7 +2183,7 @@ deserialization, and interpreter in Rust.") (origin (method url-fetch) (uri (crate-uri "peeking_take_while" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "16bhqr6rdyrp12zv381cxaaqqd0pwysvm1q8h2ygihvypvfprc8r")))) @@ -2507,10 +2195,11 @@ deserialization, and interpreter in Rust.") value. This allows you to use @code{Iterator::by_ref} and @code{Iterator::take_while} together, and still get the first value for which the @code{take_while} predicate returned false after dropping the @code{by_ref}.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-percent-encoding +(define-public rust-percent-encoding-2.1 (package (name "rust-percent-encoding") (version "2.1.0") @@ -2518,7 +2207,7 @@ the @code{take_while} predicate returned false after dropping the @code{by_ref}. (origin (method url-fetch) (uri (crate-uri "percent-encoding" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0bp3zrsk3kr47fbpipyczidbbx4g54lzxdm77ni1i3qws10mdzfl")))) @@ -2526,24 +2215,25 @@ the @code{take_while} predicate returned false after dropping the @code{by_ref}. (home-page "https://github.com/servo/rust-url/") (synopsis "Percent encoding and decoding") (description "This crate provides percent encoding and decoding.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-percent-encoding-1 +(define-public rust-percent-encoding-1.0 (package - (inherit rust-percent-encoding) + (inherit rust-percent-encoding-2.1) (name "rust-percent-encoding") (version "1.0.1") (source (origin (method url-fetch) (uri (crate-uri "percent-encoding" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0cgq08v1fvr6bs5fvy390cz830lq4fak8havdasdacxcw790s09i")))))) -(define-public rust-permutohedron +(define-public rust-permutohedron-0.2 (package (name "rust-permutohedron") (version "0.2.4") @@ -2551,7 +2241,7 @@ the @code{take_while} predicate returned false after dropping the @code{by_ref}. (origin (method url-fetch) (uri (crate-uri "permutohedron" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0b1pzh48j86v46wxngch6k1kx9cdw3jr3lwa86gd6jd4bmxzz1xn")))) @@ -2562,10 +2252,11 @@ the @code{take_while} predicate returned false after dropping the @code{by_ref}. "Generate permutations of sequences. Either lexicographical order permutations, or a minimal swaps permutation sequence implemented using Heap's algorithm.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-pico-sys +(define-public rust-pico-sys-0.0 (package (name "rust-pico-sys") (version "0.0.1") @@ -2573,22 +2264,19 @@ algorithm.") (origin (method url-fetch) (uri (crate-uri "pico-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1q5pg0ms6szz6b5h26h4k40zb76zbwwjgyigac4wly9qngdj4yl5")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-gcc" ,rust-gcc) - ("rust-libc" ,rust-libc)))) (home-page "https://github.com/reem/rust-pico-sys") (synopsis "Bindings to the PicoHTTPParser") (description "This package provides bindings to the PicoHTTPParser.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-pin-utils +(define-public rust-pin-utils-0.1 (package (name "rust-pin-utils") (version "0.1.0-alpha.4") @@ -2596,7 +2284,7 @@ algorithm.") (origin (method url-fetch) (uri (crate-uri "pin-utils" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "11xmyx00n4m37d546by2rxb8ryxs12v55cc172i3yak1rqccd52q")))) @@ -2604,10 +2292,11 @@ algorithm.") (home-page "https://github.com/rust-lang-nursery/pin-utils") (synopsis "Utilities for pinning") (description "This crate provides utilities for pinning values on the stack.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-pkg-config +(define-public rust-pkg-config-0.3 (package (name "rust-pkg-config") (version "0.3.14") @@ -2615,25 +2304,23 @@ algorithm.") (origin (method url-fetch) (uri (crate-uri "pkg-config" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "135ia995lqzr0gxpk85h0bjxf82kj6hbxdx924sh9jdln6r8wvk7")))) (build-system cargo-build-system) - (arguments - `(#:cargo-development-inputs - (("rust-lazy-static" ,rust-lazy-static)))) - (inputs - `(("pkg-config" ,pkg-config))) + ;(inputs + ; `(("pkg-config" ,pkg-config))) (home-page "https://github.com/rust-lang/pkg-config-rs") (synopsis "Library to run the pkg-config system tool") (description "A library to run the pkg-config system tool at build time in order to be used in Cargo build scripts.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-plain +(define-public rust-plain-0.2 (package (name "rust-plain") (version "0.2.3") @@ -2641,7 +2328,7 @@ used in Cargo build scripts.") (origin (method url-fetch) (uri (crate-uri "plain" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "19n1xbxb4wa7w891268bzf6cbwq4qvdb86bik1z129qb0xnnnndl")))) @@ -2650,10 +2337,11 @@ used in Cargo build scripts.") (synopsis "Rust library that allows reinterpreting data safely") (description "This package provides a small Rust library that allows users to reinterpret data of certain types safely.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-plugin +(define-public rust-plugin-0.2 (package (name "rust-plugin") (version "0.2.6") @@ -2661,23 +2349,19 @@ used in Cargo build scripts.") (origin (method url-fetch) (uri (crate-uri "plugin" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1q7nghkpvxxr168y2jnzh3w7qc9vfrby9n7ygy3xpj0bj71hsshs")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-typemap" ,rust-typemap)) - #:cargo-development-inputs - (("rust-void" ,rust-void)))) (home-page "https://github.com/reem/rust-plugin") (synopsis "Lazily evaluated, order-independent plugins for extensible types") (description "Lazily evaluated, order-independent plugins for extensible types.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-pocket-resources +(define-public rust-pocket-resources-0.3 (package (name "rust-pocket-resources") (version "0.3.2") @@ -2685,7 +2369,7 @@ used in Cargo build scripts.") (origin (method url-fetch) (uri (crate-uri "pocket-resources" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1n2i5vmi8fdbw89wm5nz1ws1z9f1qax911p6ksg4scmdg23z6df1")))) @@ -2694,9 +2378,10 @@ used in Cargo build scripts.") (synopsis "Include resources in your applications") (description "This crate allows you to include resources in your applications.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-ppv-lite86 +(define-public rust-ppv-lite86-0.2 (package (name "rust-ppv-lite86") (version "0.2.5") @@ -2704,7 +2389,7 @@ applications.") (origin (method url-fetch) (uri (crate-uri "ppv-lite86" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "06snnv338w341nicfqba2jgln5dsla72ndkgrw7h1dfdb3vgkjz3")))) @@ -2713,10 +2398,11 @@ applications.") (synopsis "Implementation of the crypto-simd API for x86") (description "This crate provides an implementation of the crypto-simd API for x86.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-proc-macro2 +(define-public rust-proc-macro2-0.4 (package (name "rust-proc-macro2") (version "0.4.30") @@ -2725,23 +2411,21 @@ for x86.") (method url-fetch) (uri (crate-uri "proc-macro2" version)) (file-name - (string-append name "-" version ".tar.gz")) + (string-append name "-" version ".crate")) (sha256 (base32 "0nd71fl24sys066jrha6j7i34nfkjv44yzw8yww9742wmc8j0gfg")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs (("rust-unicode-xid" ,rust-unicode-xid-0.1)) - #:cargo-development-inputs (("rust-quote" ,rust-quote)))) (home-page "https://github.com/alexcrichton/proc-macro2") (synopsis "Stable implementation of the upcoming new `proc_macro` API") (description "This package provides a stable implementation of the upcoming new `proc_macro` API. Comes with an option, off by default, to also reimplement itself in terms of the upstream unstable API.") + (properties '((hidden? . #t))) ;; Dual licensed. (license (list license:asl2.0 license:expat)))) -(define-public rust-quick-error +(define-public rust-quick-error-1.2 (package (name "rust-quick-error") (version "1.2.2") @@ -2749,7 +2433,7 @@ in terms of the upstream unstable API.") (origin (method url-fetch) (uri (crate-uri "quick-error" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1w6kgwwv7p7zr0yyg5rb315lkk24bimywklwx7fsvsbwi10bjx4j")))) @@ -2758,10 +2442,11 @@ in terms of the upstream unstable API.") (synopsis "Macro which makes error types pleasant to write") (description "This crate provides a macro which makes error types pleasant to write.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-quote +(define-public rust-quote-0.6 (package (name "rust-quote") (version "0.6.12") @@ -2770,20 +2455,19 @@ to write.") (method url-fetch) (uri (crate-uri "quote" version)) (file-name - (string-append name "-" version ".tar.gz")) + (string-append name "-" version ".crate")) (sha256 (base32 "1nw0klza45hf127kfyrpxsxd5jw2l6h21qxalil3hkr7bnf7kx7s")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2)))) (home-page "https://github.com/dtolnay/quote") (synopsis "Quasi-quoting macro quote!(...)") (description "Quasi-quoting macro quote!(...)") + (properties '((hidden? . #t))) ;; Dual licensed. (license (list license:asl2.0 license:expat)))) -(define-public rust-rand +(define-public rust-rand-0.4 (package (name "rust-rand") (version "0.4.3") @@ -2791,43 +2475,35 @@ to write.") (origin (method url-fetch) (uri (crate-uri "rand" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1gfgnqfj2pyh27dcb720jpawskllwnbvxh816ddyykv269xz8ml3")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-fuchsia-zircon" ,rust-fuchsia-zircon) - ("rust-libc" ,rust-libc) - ("rust-winapi" ,rust-winapi)))) (home-page "https://crates.io/crates/rand") (synopsis "Random number generators and other randomness functionality") (description "Rand provides utilities to generate random numbers, to convert them to useful types and distributions, and some randomness-related algorithms.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) (define-public rust-rand-0.3 (package - (inherit rust-rand) + (inherit rust-rand-0.4) (name "rust-rand") (version "0.3.23") (source (origin (method url-fetch) (uri (crate-uri "rand" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0v679h38pjjqj5h4md7v2slsvj6686qgcn7p9fbw3h43iwnk1b34")))) - (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc) - ("rust-rand" ,rust-rand)))))) + "0v679h38pjjqj5h4md7v2slsvj6686qgcn7p9fbw3h43iwnk1b34")))))) -(define-public rust-rawpointer +(define-public rust-rawpointer-0.1 (package (name "rust-rawpointer") (version "0.1.0") @@ -2835,7 +2511,7 @@ useful types and distributions, and some randomness-related algorithms.") (origin (method url-fetch) (uri (crate-uri "rawpointer" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "06ghpm9y7gacks78s3maakha07kbnwrxif5q37r2l7z1sali3b7b")))) @@ -2845,12 +2521,13 @@ useful types and distributions, and some randomness-related algorithms.") (description "Extra methods for raw pointers. For example @code{.post_inc()} and @code{.pre_dec()} (c.f. @code{ptr++} and @code{--ptr}) and @code{ptrdistance}.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) ;; This package requires features which are unavailable ;; on the stable releases of Rust. -(define-public rust-redox-syscall ; guix upstreamable +(define-public rust-redox-syscall-0.1 (package (name "rust-redox-syscall") (version "0.1.56") @@ -2858,7 +2535,7 @@ and @code{ptrdistance}.") (origin (method url-fetch) (uri (crate-uri "redox_syscall" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "110y7dyfm2vci4x5vk7gr0q551dvp31npl99fnsx2fb17wzwcf94")))) @@ -2870,7 +2547,7 @@ system calls.") (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-regex-syntax +(define-public rust-regex-syntax-0.6 (package (name "rust-regex-syntax") (version "0.6.10") @@ -2878,22 +2555,20 @@ system calls.") (origin (method url-fetch) (uri (crate-uri "regex-syntax" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0p47lf38yj2g2fnmvnraccqlxwk35zr76hlnqi8yva932nzqam6d")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-ucd-util" ,rust-ucd-util)))) (home-page "https://github.com/rust-lang/regex") (synopsis "Regular expression parser") (description "This package provides a regular expression parser.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-remove-dir-all +(define-public rust-remove-dir-all-0.5 (package (name "rust-remove-dir-all") (version "0.5.2") @@ -2901,31 +2576,21 @@ system calls.") (origin (method url-fetch) (uri (crate-uri "remove_dir_all" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0bkrlyg26mgizpiy1yb2hhpgscxcag8r5fnckqsvk25608vzm0sa")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-winapi" ,rust-winapi)) - #:cargo-development-inputs - (("rust-doc-comment" ,rust-doc-comment)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-source - ;; The test phase expects there to be a README.md in the root directory. - (lambda _ - (invoke "touch" "README.md")))))) (home-page "https://github.com/XAMPPRocky/remove_dir_all") (synopsis "Implementation of remove_dir_all for Windows") (description "This package provides a safe, reliable implementation of @code{remove_dir_all} for Windows") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-resolv-conf +(define-public rust-resolv-conf-0.6 (package (name "rust-resolv-conf") (version "0.6.2") @@ -2933,24 +2598,20 @@ system calls.") (origin (method url-fetch) (uri (crate-uri "resolv-conf" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1jvdsmksdf6yiipm3aqahyv8n1cjd7wqc8sa0p0gzsax3fmb8qxj")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-quick-error" ,rust-quick-error) - ("rust-hostname" ,rust-hostname)) - #:cargo-test-flags '("--release" "--lib" "--examples"))) ; doc tests fail (home-page "https://github.com/tailhook/resolv-conf") (synopsis "/etc/resolv.conf parser") (description "An /etc/resolv.conf parser crate for Rust.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-rustc-demangle +(define-public rust-rustc-demangle-0.1 (package (name "rust-rustc-demangle") (version "0.1.16") @@ -2958,25 +2619,20 @@ system calls.") (origin (method url-fetch) (uri (crate-uri "rustc-demangle" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "10qp42sl1wrdbgbbh8rnay2grm976z7hqgz32c4y09l1c071qsac")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-compiler-builtins" - ,rust-compiler-builtins) - ("rust-rustc-std-workspace-core" - ,rust-rustc-std-workspace-core)))) (home-page "https://github.com/alexcrichton/rustc-demangle") (synopsis "Rust compiler symbol demangling") (description "This package demanges the symbols from the Rust compiler.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-rustc-hash +(define-public rust-rustc-hash-1.0 (package (name "rust-rustc-hash") (version "1.0.0") @@ -2984,7 +2640,7 @@ system calls.") (origin (method url-fetch) (uri (crate-uri "rustc-hash" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "114bf72466bl63i5hh8fgqfnhihs0w1m9c9jz505095agfixnvg0")))) @@ -2993,10 +2649,11 @@ system calls.") (synopsis "Speedy, non-cryptographic hash used in rustc") (description "This package provides a speedy, non-cryptographic hash used in rustc.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-rustc-serialize +(define-public rust-rustc-serialize-0.3 (package (name "rust-rustc-serialize") (version "0.3.24") @@ -3004,14 +2661,11 @@ system calls.") (origin (method url-fetch) (uri (crate-uri "rustc-serialize" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1nkg3vasg7nk80ffkazizgiyv3hb1l9g3d8h17cajbkx538jiwfw")))) (build-system cargo-build-system) - (arguments - `(#:cargo-development-inputs - (("rust-rand" ,rust-rand-0.3)))) (home-page "https://github.com/rust-lang-deprecated/rustc-serialize") (synopsis "Generic serialization/deserialization support") (description @@ -3019,10 +2673,11 @@ system calls.") corresponding to the @code{derive(RustcEncodable, RustcDecodable)} mode in the compiler. Also includes support for hex, base64, and json encoding and decoding.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-rustc-std-workspace-core +(define-public rust-rustc-std-workspace-core-1.0 (package (name "rust-rustc-std-workspace-core") (version "1.0.0") @@ -3030,7 +2685,7 @@ decoding.") (origin (method url-fetch) (uri (crate-uri "rustc-std-workspace-core" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1309xhwyai9xpz128xrfjqkmnkvgjwddznmj7brbd8i8f58zamhr")))) @@ -3039,10 +2694,11 @@ decoding.") (synopsis "Explicitly empty crate for rust-lang/rust integration") (description "This crate provides an explicitly empty crate for rust-lang/rust integration.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-safemem +(define-public rust-safemem-0.3 (package (name "rust-safemem") (version "0.3.2") @@ -3050,7 +2706,7 @@ rust-lang/rust integration.") (origin (method url-fetch) (uri (crate-uri "safemem" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1l1ljkm4lpyryrv2ndaxi1f7z1f3v9bwy1rzl9f9mbhx04iq9c6j")))) @@ -3059,10 +2715,11 @@ rust-lang/rust integration.") (synopsis "Safe wrappers for memory-accessing functions") (description "Safe wrappers for memory-accessing functions, like @code{std::ptr::copy()}.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-same-file +(define-public rust-same-file-1.0 (package (name "rust-same-file") (version "1.0.5") @@ -3070,23 +2727,21 @@ rust-lang/rust integration.") (origin (method url-fetch) (uri (crate-uri "same-file" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "08a4zy10pjindf2rah320s6shgswk13mqw7s61m8i1y1xpf8spjq")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-winapi-util" ,rust-winapi-util)))) (home-page "https://github.com/BurntSushi/same-file") (synopsis "Determine whether two file paths point to the same file") (description "This package provides a simple crate for determining whether two file paths point to the same file.") + (properties '((hidden? . #t))) (license (list license:unlicense license:expat)))) -(define-public rust-schannel +(define-public rust-schannel-0.1 (package (name "rust-schannel") (version "0.1.15") @@ -3094,23 +2749,20 @@ paths point to the same file.") (origin (method url-fetch) (uri (crate-uri "schannel" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0f9k4pm8yc3z0n1n8hazvnrvg52f0sfxjc91bhf3r76rb3rapxpj")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static) - ("rust-winapi" ,rust-winapi)))) (home-page "https://github.com/steffengy/schannel-rs") (synopsis "Rust bindings to the Windows SChannel APIs") (description "Rust bindings to the Windows SChannel APIs providing TLS client and server functionality.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-scoped-threadpool +(define-public rust-scoped-threadpool-0.1 (package (name "rust-scoped-threadpool") (version "0.1.9") @@ -3118,14 +2770,11 @@ server functionality.") (origin (method url-fetch) (uri (crate-uri "scoped_threadpool" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1a26d3lk40s9mrf4imhbik7caahmw2jryhhb6vqv6fplbbgzal8x")))) (build-system cargo-build-system) - (arguments - `(#:cargo-development-inputs - (("rust-lazy-static" ,rust-lazy-static)))) (home-page "https://github.com/Kimundi/scoped-threadpool-rs") (synopsis "library for scoped and cached threadpools") (description @@ -3135,10 +2784,11 @@ the underlying threads. Jobs are runnable by borrowing the pool for a given scope, during which an arbitrary number of them can be executed. These jobs can access data of any lifetime outside of the pools scope, which allows working on non-'static references in parallel.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-scoped-tls +(define-public rust-scoped-tls-1.0 (package (name "rust-scoped-tls") (version "1.0.0") @@ -3146,7 +2796,7 @@ non-'static references in parallel.") (origin (method url-fetch) (uri (crate-uri "scoped-tls" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1hj8lifzvivdb1z02lfnzkshpvk85nkgzxsy2hc0zky9wf894spa")))) @@ -3156,24 +2806,25 @@ non-'static references in parallel.") (description "This crate provides a library implementation of the standard library's old @code{scoped_thread_local!} macro for providing scoped access to @dfn{thread local storage} (TLS) so any type can be stored into TLS.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) (define-public rust-scoped-tls-0.1 (package - (inherit rust-scoped-tls) + (inherit rust-scoped-tls-1.0) (name "rust-scoped-tls") (version "0.1.2") (source (origin (method url-fetch) (uri (crate-uri "scoped-tls" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0a2bn9d2mb07c6l16sadijy4p540g498zddfxyiq4rsqpwrglbrk")))))) -(define-public rust-scopeguard +(define-public rust-scopeguard-1.0 (package (name "rust-scopeguard") (version "1.0.0") @@ -3181,7 +2832,7 @@ library's old @code{scoped_thread_local!} macro for providing scoped access to (origin (method url-fetch) (uri (crate-uri "scopeguard" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "03aay84r1f6w87ckbpj6cc4rnsxkxcfs13n5ynxjia0qkgjiabml")))) @@ -3193,12 +2844,13 @@ given closure when it goes out of scope, even if the code between panics (assuming unwinding panic). Defines the macros @code{defer!}, @code{defer_on_unwind!}, @code{defer_on_success!} as shorthands for guards with one of the implemented strategies.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) (define-public rust-scopeguard-0.3 (package - (inherit rust-scopeguard) + (inherit rust-scopeguard-1.0) (name "rust-scopeguard") (version "0.3.3") (source @@ -3206,12 +2858,12 @@ with one of the implemented strategies.") (method url-fetch) (uri (crate-uri "scopeguard" version)) (file-name - (string-append name "-" version ".tar.gz")) + (string-append name "-" version ".crate")) (sha256 (base32 "09sy9wbqp409pkwmqni40qmwa99ldqpl48pp95m1xw8sc19qy9cl")))))) -(define-public rust-security-framework-sys +(define-public rust-security-framework-sys-0.3 (package (name "rust-security-framework-sys") (version "0.3.1") @@ -3219,23 +2871,20 @@ with one of the implemented strategies.") (origin (method url-fetch) (uri (crate-uri "security-framework-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0mlsakq9kmqyc0fg2hcbgm6rjk55mb0rhjw2wid3hqdzkjcghdln")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-core-foundation-sys" - ,rust-core-foundation-sys)))) (home-page "https://lib.rs/crates/security-framework-sys") (synopsis "Apple `Security.framework` low-level FFI bindings") (description "Apple `Security.framework` low-level FFI bindings.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-semver-parser +(define-public rust-semver-parser-0.9 (package (name "rust-semver-parser") (version "0.9.0") @@ -3243,7 +2892,7 @@ with one of the implemented strategies.") (origin (method url-fetch) (uri (crate-uri "semver-parser" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1ahqhvgpzhcsd28id7xnrjv4419i9yyalhm7d7zi430qx0hi2vml")))) @@ -3251,24 +2900,25 @@ with one of the implemented strategies.") (home-page "https://github.com/steveklabnik/semver-parser") (synopsis "Parsing of the semver spec") (description "This package provides for parsing of the semver spec.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) (define-public rust-semver-parser-0.7 (package - (inherit rust-semver-parser) + (inherit rust-semver-parser-0.9) (name "rust-semver-parser") (version "0.7.0") (source (origin (method url-fetch) (uri (crate-uri "semver-parser" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "18vhypw6zgccnrlm5ps1pwa0khz7ry927iznpr88b87cagr1v2iq")))))) -(define-public rust-shlex +(define-public rust-shlex-0.1 (package (name "rust-shlex") (version "0.1.1") @@ -3276,7 +2926,7 @@ with one of the implemented strategies.") (origin (method url-fetch) (uri (crate-uri "shlex" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1lmv6san7g8dv6jdfp14m7bdczq9ss7j7bgsfqyqjc3jnjfippvz")))) @@ -3285,10 +2935,11 @@ with one of the implemented strategies.") (synopsis "Split a string into shell words, like Python's shlex") (description "This crate provides a method to split a string into shell words, like Python's shlex.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-slab +(define-public rust-slab-0.4 (package (name "rust-slab") (version "0.4.2") @@ -3296,7 +2947,7 @@ words, like Python's shlex.") (origin (method url-fetch) (uri (crate-uri "slab" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1y59xsa27jk84sxzswjk60xcjf8b4fm5960jwpznrrcmasyva4f1")))) @@ -3305,9 +2956,10 @@ words, like Python's shlex.") (synopsis "Pre-allocated storage for a uniform data type") (description "This create provides a pre-allocated storage for a uniform data type.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-socket2 +(define-public rust-socket2-0.3 (package (name "rust-socket2") (version "0.3.11") @@ -3315,29 +2967,21 @@ data type.") (origin (method url-fetch) (uri (crate-uri "socket2" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "11bdcz04i106g4q7swkll0qxrb4287srqd2k3aq2q6i22zjlvdz8")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-cfg-if" ,rust-cfg-if) - ("rust-libc" ,rust-libc) - ("rust-redox-syscall" ,rust-redox-syscall) - ("rust-winapi" ,rust-winapi)) - #:cargo-development-inputs - (("rust-tempdir" ,rust-tempdir)) - #:tests? #f)) ; Tests expect network connectivity. (home-page "https://github.com/alexcrichton/socket2-rs") (synopsis "Networking sockets in Rust") (description "This package provides utilities for handling networking sockets with a maximal amount of configuration possible intended.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-sourcefile +(define-public rust-sourcefile-0.1 (package (name "rust-sourcefile") (version "0.1.4") @@ -3345,23 +2989,21 @@ maximal amount of configuration possible intended.") (origin (method url-fetch) (uri (crate-uri "sourcefile" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1lwa6973zs4bgj29my7agfjgk4nw9hp6j7dfnr13nid85fw7rxsb")))) (build-system cargo-build-system) - (arguments - `(#:cargo-development-inputs - (("rust-tempfile" ,rust-tempfile)))) (home-page "https://github.com/derekdreery/sourcefile-rs") (synopsis "Concatenate source from multiple files") (description "A library for concatenating source from multiple files, whilst keeping track of where each new file and line starts.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-spin +(define-public rust-spin-0.5 (package (name "rust-spin") (version "0.5.0") @@ -3369,7 +3011,7 @@ track of where each new file and line starts.") (origin (method url-fetch) (uri (crate-uri "spin" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0m9clchsj0rf13bggsgvbv9haiy0f6rhvnvkpvkk8720a5pkydj4")))) @@ -3379,9 +3021,10 @@ track of where each new file and line starts.") (description "This crate provides synchronization primitives based on spinning. They may contain data, are usable without @code{std},and static initializers are available.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-stable-deref-trait +(define-public rust-stable-deref-trait-1.1 (package (name "rust-stable-deref-trait") (version "1.1.1") @@ -3389,7 +3032,7 @@ initializers are available.") (origin (method url-fetch) (uri (crate-uri "stable_deref_trait" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1j2lkgakksmz4vc5hfawcch2ipiskrhjs1sih0f3br7s7rys58fv")))) @@ -3402,10 +3045,11 @@ types which deref to a fixed address which is valid even when the containing type is moved. For example, Box, Vec, Rc, Arc and String implement this trait. Additionally, it defines CloneStableDeref for types like Rc where clones deref to the same address.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-stacker +(define-public rust-stacker-0.1 (package (name "rust-stacker") (version "0.1.5") @@ -3413,26 +3057,21 @@ to the same address.") (origin (method url-fetch) (uri (crate-uri "stacker" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0js0axz5nla1mkr2dm2vrv9rj964ng1lrv4l43sqlnfgawplhygv")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-cfg-if" ,rust-cfg-if) - ("rust-libc" ,rust-libc) - ("rust-winapi" ,rust-winapi) - ("rust-cc" ,rust-cc)))) (home-page "https://github.com/rust-lang/stacker") (synopsis "Manual segmented stacks for Rust") (description "This package provides a stack growth library useful when implementing deeply recursive algorithms that may accidentally blow the stack.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-static-assertions +(define-public rust-static-assertions-0.3 (package (name "rust-static-assertions") (version "0.3.4") @@ -3440,7 +3079,7 @@ deeply recursive algorithms that may accidentally blow the stack.") (origin (method url-fetch) (uri (crate-uri "static-assertions" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1lw33i89888yb3x29c6dv4mrkg3534n0rlg3r7qzh4p58xmv6gkz")))) @@ -3450,9 +3089,10 @@ deeply recursive algorithms that may accidentally blow the stack.") (description "This package provides compile-time assertions to ensure that invariants are met.") + (properties '((hidden? . #t))) (license (list license:expat license:asl2.0)))) -(define-public rust-stdweb-internal-runtime +(define-public rust-stdweb-internal-runtime-0.1 (package (name "rust-stdweb-internal-runtime") (version "0.1.4") @@ -3460,7 +3100,7 @@ are met.") (origin (method url-fetch) (uri (crate-uri "stdweb-internal-runtime" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1nhpyra7glbwcpakhpj5a3d7h7kx1ynif473nzshmk226m91f8ym")))) @@ -3469,10 +3109,11 @@ are met.") (synopsis "Internal runtime for the @code{stdweb} crate") (description "This crate provides internal runtime for the @code{stdweb} crate.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-stdweb-internal-test-macro +(define-public rust-stdweb-internal-test-macro-0.1 (package (name "rust-stdweb-internal-test-macro") (version "0.1.0") @@ -3480,23 +3121,20 @@ crate.") (origin (method url-fetch) (uri (crate-uri "stdweb-internal-test-macro" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "12rrm7p77xnm3xacgn3rgniiyyjb4gq7902wpbljsvbx045z69l2")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-proc-macro2" ,rust-proc-macro2) - ("rust-quote" ,rust-quote)))) (home-page "https://github.com/koute/stdweb") (synopsis "Internal crate of the `stdweb` crate") (description "Internal crate of the @code{stdweb} crate.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-streaming-stats +(define-public rust-streaming-stats-0.2 (package (name "rust-streaming-stats") (version "0.2.2") @@ -3504,22 +3142,20 @@ crate.") (origin (method url-fetch) (uri (crate-uri "streaming-stats" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0l7xz4g6709s80zqpvlhrg0qhgz64r94cwhmfsg8xhabgznbp2px")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-num-traits" ,rust-num-traits)))) (home-page "https://github.com/BurntSushi/rust-stats") (synopsis "Compute basic statistics on streams") (description "Experimental crate for computing basic statistics on streams.") + (properties '((hidden? . #t))) (license (list license:unlicense license:expat)))) -(define-public rust-strsim +(define-public rust-strsim-0.9 (package (name "rust-strsim") (version "0.9.2") @@ -3527,7 +3163,7 @@ crate.") (origin (method url-fetch) (uri (crate-uri "strsim" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1xphwhf86yxxmcpvm4mikj8ls41f6nf7gqyjm98b74mfk81h6b03")))) @@ -3537,23 +3173,24 @@ crate.") (description "This crate includes implementations of string similarity metrics. It includes Hamming, Levenshtein, OSA, Damerau-Levenshtein, Jaro, and Jaro-Winkler.") + (properties '((hidden? . #t))) (license license:expat))) (define-public rust-strsim-0.8 (package - (inherit rust-strsim) + (inherit rust-strsim-0.9) (name "rust-strsim") (version "0.8.0") (source (origin (method url-fetch) (uri (crate-uri "strsim" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0sjsm7hrvjdifz661pjxq5w4hf190hx53fra8dfvamacvff139cf")))))) -(define-public rust-synstructure-test-traits +(define-public rust-synstructure-test-traits-0.1 (package (name "rust-synstructure-test-traits") (version "0.1.0") @@ -3561,7 +3198,7 @@ and Jaro-Winkler.") (origin (method url-fetch) (uri (crate-uri "synstructure_test_traits" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1b3fs2b9kc1gy9dilaxqjbdl4z0mlrbbxjzkprdx953rif1c3q66")))) @@ -3570,9 +3207,10 @@ and Jaro-Winkler.") (synopsis "Helper test traits for synstructure doctests") (description "This package provides helper test traits for synstructure doctests.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-tar +(define-public rust-tar-0.4 (package (name "rust-tar") (version "0.4.26") @@ -3580,20 +3218,11 @@ and Jaro-Winkler.") (origin (method url-fetch) (uri (crate-uri "tar" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1lr6v3cpkfxd2lk5ll2jd8wr1xdskwj35smnh5sfb8xvzzxnn6dk")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-filetime" ,rust-filetime) - ("rust-libc" ,rust-libc) - ("rust-redox-syscall" ,rust-redox-syscall) - ("rust-xattr" ,rust-xattr)) - #:cargo-development-inputs - (("rust-tempdir" ,rust-tempdir)) - #:tests? #f)) ; Test archives are not distributed in the crate tarball. (home-page "https://github.com/alexcrichton/tar-rs") (synopsis "Tar file reading/writing for Rust") (description @@ -3602,10 +3231,11 @@ writer. This library does not currently handle compression, but it is abstract over all I/O readers and writers. Additionally, great lengths are taken to ensure that the entire contents are never required to be entirely resident in memory all at once.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-tempdir +(define-public rust-tempdir-0.3 (package (name "rust-tempdir") (version "0.3.7") @@ -3613,24 +3243,21 @@ memory all at once.") (origin (method url-fetch) (uri (crate-uri "tempdir" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1n5n86zxpgd85y0mswrp5cfdisizq2rv3la906g6ipyc03xvbwhm")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-rand" ,rust-rand) - ("rust-remove-dir-all" ,rust-remove-dir-all)))) (home-page "https://github.com/rust-lang-deprecated/tempdir") (synopsis "Temporary directory management for Rust") (description "This package provides a library for managing a temporary directory and deleting all contents when it's dropped.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-tempfile +(define-public rust-tempfile-3.0 (package (name "rust-tempfile") (version "3.0.2") @@ -3638,27 +3265,21 @@ deleting all contents when it's dropped.") (origin (method url-fetch) (uri (crate-uri "tempfile" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0ny1cdbcsrmwjpy4k9366xm6p0jqkrmrvr0cln2djxspp1inyxs7")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc) - ("rust-rand" ,rust-rand) - ("rust-redox-syscall" ,rust-redox-syscall) - ("rust-remove-dir-all" ,rust-remove-dir-all) - ("rust-winapi" ,rust-winapi)))) (home-page "http://stebalien.com/projects/tempfile-rs") (synopsis "Library for managing temporary files and directories") (description "This package provides a library for managing temporary files and directories.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-term +(define-public rust-term-0.4 (package (name "rust-term") (version "0.4.6") @@ -3666,23 +3287,20 @@ directories.") (origin (method url-fetch) (uri (crate-uri "term" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1wbh8ngqkqr3f6wz902yplf60bd5yapnckvrkgmzp5nffi7n8qzs")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-kernel32-sys" ,rust-kernel32-sys) - ("rust-winapi" ,rust-winapi)))) (home-page "https://github.com/Stebalien/term") (synopsis "Terminal formatting library") (description "This package provides a terminal formatting library in rust.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-termcolor +(define-public rust-termcolor-1.0 (package (name "rust-termcolor") (version "1.0.5") @@ -3690,22 +3308,20 @@ directories.") (origin (method url-fetch) (uri (crate-uri "termcolor" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0vjfsn1a8zvqhnrbygrz1id6yckwv1dncw3w4zj65qdx0f00kmln")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-wincolor" ,rust-wincolor)))) (home-page "https://github.com/BurntSushi/termcolor") (synopsis "Library for writing colored text to a terminal") (description "This package provides a simple cross platform library for writing colored text to a terminal.") + (properties '((hidden? . #t))) (license (list license:unlicense license:expat)))) -(define-public rust-termios +(define-public rust-termios-0.3 (package (name "rust-termios") (version "0.3.1") @@ -3713,13 +3329,11 @@ writing colored text to a terminal.") (origin (method url-fetch) (uri (crate-uri "termios" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "09any1p4jp4bphvb5ikagnvwjc3xn2djchy96nkpa782xb2j1dkj")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs (("rust-libc" ,rust-libc)))) (home-page "https://github.com/dcuddeback/termios-rs") (synopsis "Safe bindings for the termios library") (description @@ -3727,9 +3341,10 @@ writing colored text to a terminal.") to the terminal I/O interface implemented by Unix operating systems. The safe bindings are a small wrapper around the raw C functions, which converts integer return values to @code{std::io::Result} to indicate success or failure.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-thread-id +(define-public rust-thread-id-3.3 (package (name "rust-thread-id") (version "3.3.0") @@ -3737,25 +3352,21 @@ return values to @code{std::io::Result} to indicate success or failure.") (origin (method url-fetch) (uri (crate-uri "thread-id" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1h90v19fjz3x9b25ywh68z5yf2zsmm6h5zb4rl302ckbsp4z9yy7")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc) - ("rust-redox-syscall" ,rust-redox-syscall) - ("rust-winapi" ,rust-winapi)))) (home-page "https://github.com/ruuda/thread-id") (synopsis "Get a unique ID for the current thread in Rust") (description "For diagnostics and debugging it can often be useful to get an ID that is different for every thread.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-thread-local +(define-public rust-thread-local-0.3 (package (name "rust-thread-local") (version "0.3.6") @@ -3763,21 +3374,19 @@ different for every thread.") (origin (method url-fetch) (uri (crate-uri "thread_local" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "06rzik99p8c5js8238yhc8rk6np543ylb1dy9nrw5v80j0r3xdf6")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static)))) (home-page "https://github.com/Amanieu/thread_local-rs") (synopsis "Per-object thread-local storage") (description "Per-object thread-local storage") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-threadpool +(define-public rust-threadpool-1.7 (package (name "rust-threadpool") (version "1.7.1") @@ -3785,23 +3394,21 @@ different for every thread.") (origin (method url-fetch) (uri (crate-uri "threadpool" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0rd89n1q7vy47w4c32cnynibffv9kj3jy3dwr0536n9lbw5ckw72")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-num-cpus" ,rust-num-cpus)))) (home-page "https://github.com/rust-threadpool/rust-threadpool") (synopsis "Thread pool for running jobs on a fixed set of worker threads") (description "This package provides a thread pool for running a number of jobs on a fixed set of worker threads.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-time +(define-public rust-time-0.1 (package (name "rust-time") (version "0.1.39") @@ -3809,30 +3416,21 @@ fixed set of worker threads.") (origin (method url-fetch) (uri (crate-uri "time" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "161hqx0gw722ikydanpahky447vaxqncwmkj66rny282vzqpalx1")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc) - ("rust-redox-syscall" ,rust-redox-syscall) - ("rust-rustc-serialize" ,rust-rustc-serialize) - ("rust-winapi" ,rust-winapi)) - #:cargo-development-inputs - (("rust-log" ,rust-log) - ("rust-winapi" ,rust-winapi)) - #:tests? #f)) ; Tests have difficulty with the timezones. (home-page "https://github.com/rust-lang-deprecated/time") (synopsis "Simple time handling in Rust") (description "This package provides utilities for working with time-related functions in Rust.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-tokio-mock-task +(define-public rust-tokio-mock-task-0.1 (package (name "rust-tokio-mock-task") (version "0.1.1") @@ -3840,19 +3438,18 @@ in Rust.") (origin (method url-fetch) (uri (crate-uri "tokio-mock-task" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1y7q83qfk9ljjfvs82b453pmz9x1v3d6kr4x55j8mal01s6790dw")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs (("rust-futures" ,rust-futures)))) (home-page "https://github.com/carllerche/tokio-mock-task") (synopsis "Mock a Tokio task") (description "Mock a Tokio task") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-tracing-core +(define-public rust-tracing-core-0.1 (package (name "rust-tracing-core") (version "0.1.2") @@ -3860,22 +3457,20 @@ in Rust.") (origin (method url-fetch) (uri (crate-uri "tracing-core" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "01fa73wzw2m5ybi3kkd52dgrw97mgc3i6inmhwys46ab28giwnxi")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static)))) (home-page "https://tokio.rs") (synopsis "Core primitives for application-level tracing") (description "Core primitives for application-level tracing.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-traitobject +(define-public rust-traitobject-0.1 (package (name "rust-traitobject") (version "0.1.0") @@ -3883,7 +3478,7 @@ in Rust.") (origin (method url-fetch) (uri (crate-uri "traitobject" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0yb0n8822mr59j200fyr2fxgzzgqljyxflx9y8bdy3rlaqngilgg")))) @@ -3891,10 +3486,11 @@ in Rust.") (home-page "https://github.com/reem/rust-traitobject") (synopsis "Unsafe helpers for dealing with raw trait objects") (description "Unsafe helpers for dealing with raw trait objects.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-try-from +(define-public rust-try-from-0.3 (package (name "rust-try-from") (version "0.3.2") @@ -3902,21 +3498,19 @@ in Rust.") (origin (method url-fetch) (uri (crate-uri "try_from" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "12wdd4ja7047sd3rx70hv2056hyc8gcdllcx3a41g1rnw64kng98")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-cfg-if" ,rust-cfg-if)))) (home-page "https://github.com/derekjw/try_from") (synopsis "TryFrom and TryInto traits for failable conversions") (description "TryFrom and TryInto traits for failable conversions that return a Result.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-try-lock +(define-public rust-try-lock-0.2 (package (name "rust-try-lock") (version "0.2.2") @@ -3924,7 +3518,7 @@ in Rust.") (origin (method url-fetch) (uri (crate-uri "try-lock" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "10p36rx6pqi9d0zr876xa8vksx2m66ha45myakl50rn08dxyn176")))) @@ -3933,9 +3527,10 @@ in Rust.") (synopsis "Lightweight atomic lock") (description "This package provides a lightweight atomic lock.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-typeable +(define-public rust-typeable-0.1 (package (name "rust-typeable") (version "0.1.2") @@ -3943,7 +3538,7 @@ in Rust.") (origin (method url-fetch) (uri (crate-uri "typeable" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "11w8dywgnm32hb291izjvh4zjd037ccnkk77ahk63l913zwzc40l")))) @@ -3951,9 +3546,10 @@ in Rust.") (home-page "https://github.com/reem/rust-typeable") (synopsis "Exposes Typeable, for getting TypeIds at runtime") (description "Exposes Typeable, for getting TypeIds at runtime.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-typemap +(define-public rust-typemap-0.3 (package (name "rust-typemap") (version "0.3.3") @@ -3961,21 +3557,19 @@ in Rust.") (origin (method url-fetch) (uri (crate-uri "typemap" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1xm1gbvz9qisj1l6d36hrl9pw8imr8ngs6qyanjnsad3h0yfcfv5")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-unsafe-any" ,rust-unsafe-any)))) (home-page "https://github.com/reem/rust-typemap") (synopsis "Typesafe store for many value types") (description "A typesafe store for many value types.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-typenum +(define-public rust-typenum-1.10 (package (name "rust-typenum") (version "1.10.0") @@ -3983,7 +3577,7 @@ in Rust.") (origin (method url-fetch) (uri (crate-uri "typenum" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0sc1jirllfhdi52z1xv9yqzxzpk6v7vadd13n7wvs1wnjipn6bb1")))) @@ -3994,10 +3588,11 @@ in Rust.") compile time. It currently supports bits, unsigned integers, and signed integers. It also provides a type-level array of type-level numbers, but its implementation is incomplete.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-ucd-trie +(define-public rust-ucd-trie-0.1 (package (name "rust-ucd-trie") (version "0.1.2") @@ -4005,22 +3600,20 @@ implementation is incomplete.") (origin (method url-fetch) (uri (crate-uri "ucd-trie" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1hh6kyzh5xygwy96wfmsf8v8czlzhps2lgbcyhj1xzy1w1xys04g")))) (build-system cargo-build-system) - (arguments - `(#:cargo-development-inputs - (("rust-lazy-static" ,rust-lazy-static)))) (home-page "https://github.com/BurntSushi/ucd-generate") (synopsis "Trie for storing Unicode codepoint sets and maps") (description "This package provides a trie for storing Unicode codepoint sets and maps.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-ucd-util +(define-public rust-ucd-util-0.1 (package (name "rust-ucd-util") (version "0.1.5") @@ -4028,7 +3621,7 @@ implementation is incomplete.") (origin (method url-fetch) (uri (crate-uri "ucd-util" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0x088q5z0m09a2jqcfgsnq955y8syn1mgn35cl78qinkxm4kp6zs")))) @@ -4037,10 +3630,11 @@ implementation is incomplete.") (synopsis "library for working with the Unicode character database") (description "This package provides a small utility library for working with the Unicode character database.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-unicase +(define-public rust-unicase-2.4 (package (name "rust-unicase") (version "2.4.0") @@ -4048,21 +3642,20 @@ with the Unicode character database.") (origin (method url-fetch) (uri (crate-uri "unicase" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1xmpmkakhhblq7dzab1kwyv925kv7fqjkjsxjspg6ix9n88makm8")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs (("rust-version-check" ,rust-version-check-0.1)))) (home-page "https://github.com/seanmonstar/unicase") (synopsis "Case-insensitive wrapper around strings") (description "A case-insensitive wrapper around strings.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-unicode-width +(define-public rust-unicode-width-0.1 (package (name "rust-unicode-width") (version "0.1.5") @@ -4070,7 +3663,7 @@ with the Unicode character database.") (origin (method url-fetch) (uri (crate-uri "unicode-width" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "09k5lipygardwy0660jhls08fsgknrazzivmn804gps53hiqc8w8")))) @@ -4079,10 +3672,11 @@ with the Unicode character database.") (synopsis "Determine displayed width according to Unicode rules") (description "This crate allows you to determine displayed width of @code{char} and @code{str} types according to Unicode Standard Annex #11 rules.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-unicode-xid +(define-public rust-unicode-xid-0.2 (package (name "rust-unicode-xid") (version "0.2.0") @@ -4091,7 +3685,7 @@ with the Unicode character database.") (method url-fetch) (uri (crate-uri "unicode-xid" version)) (file-name - (string-append name "-" version ".tar.gz")) + (string-append name "-" version ".crate")) (sha256 (base32 "0z09fn515xm7zyr0mmdyxa9mx2f7azcpv74pqmg611iralwpcvl2")))) @@ -4101,24 +3695,25 @@ with the Unicode character database.") (synopsis "Determine Unicode XID related properties") (description "Determine whether characters have the XID_Start or XID_Continue properties according to Unicode Standard Annex #31.") + (properties '((hidden? . #t))) ;; Dual licensed. (license (list license:asl2.0 license:expat)))) (define-public rust-unicode-xid-0.1 (package - (inherit rust-unicode-xid) + (inherit rust-unicode-xid-0.2) (name "rust-unicode-xid") (version "0.1.0") (source (origin (method url-fetch) (uri (crate-uri "unicode-xid" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1z57lqh4s18rr4x0j4fw4fmp9hf9346h0kmdgqsqx0fhjr3k0wpw")))))) -(define-public rust-unindent +(define-public rust-unindent-0.1 (package (name "rust-unindent") (version "0.1.5") @@ -4126,7 +3721,7 @@ or XID_Continue properties according to Unicode Standard Annex #31.") (origin (method url-fetch) (uri (crate-uri "unindent" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "14s97blyqgf9hzxk22iazrghj60midajkw2801dfspz3n2iqmwb3")))) (build-system cargo-build-system) @@ -4134,10 +3729,11 @@ or XID_Continue properties according to Unicode Standard Annex #31.") (synopsis "Remove a column of leading whitespace from a string") (description "This crate allows you to remove a column of leading whitespace from a string.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-unreachable +(define-public rust-unreachable-1.0 (package (name "rust-unreachable") (version "1.0.0") @@ -4145,21 +3741,20 @@ whitespace from a string.") (origin (method url-fetch) (uri (crate-uri "unreachable" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0mps2il4xy2mjqc3appas27hhn2xmvixc3bzzhfrjj74gy3i0a1q")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs (("rust-void" ,rust-void)))) (home-page "https://github.com/reem/rust-unreachable") (synopsis "Unreachable code optimization hint in rust") (description "This package provides an unreachable code optimization hint in rust.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-unsafe-any +(define-public rust-unsafe-any-0.4 (package (name "rust-unsafe-any") (version "0.4.2") @@ -4167,21 +3762,19 @@ whitespace from a string.") (origin (method url-fetch) (uri (crate-uri "unsafe-any" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0zwwphsqkw5qaiqmjwngnfpv9ym85qcsyj7adip9qplzjzbn00zk")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-traitobject" ,rust-traitobject)))) (home-page "https://tokio.rs") (synopsis "Traits and implementations for unchecked downcasting") (description "Traits and implementations for unchecked downcasting.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-untrusted +(define-public rust-untrusted-0.7 (package (name "rust-untrusted") (version "0.7.0") @@ -4189,7 +3782,7 @@ whitespace from a string.") (origin (method url-fetch) (uri (crate-uri "untrusted" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1kmfykcwif6ashkwg54gcnhxj03kpba2i9vc7z5rpr0xlgvrwdk0")))) @@ -4199,9 +3792,10 @@ whitespace from a string.") (description "Safe, fast, zero-panic, zero-crashing, zero-allocation parsing of untrusted inputs in Rust.") + (properties '((hidden? . #t))) (license license:isc))) -(define-public rust-vcpkg +(define-public rust-vcpkg-0.2 (package (name "rust-vcpkg") (version "0.2.7") @@ -4209,25 +3803,21 @@ untrusted inputs in Rust.") (origin (method url-fetch) (uri (crate-uri "vcpkg" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "15dzk1b96q946v9aisbd1bbhi33n93wvgziwh1shmscn1xflbp9k")))) (build-system cargo-build-system) - (arguments - `(#:cargo-development-inputs - (("rust-lazy-static" ,rust-lazy-static) - ("rust-tempdir" ,rust-tempdir)) - #:tests? #f)) ; tests try to link libmysql, graphite2, harfbuzz (home-page "https://github.com/mcgoo/vcpkg-rs") (synopsis "Find native dependencies in a vcpkg tree at build time") (description "This package provides a library to find native dependencies in a @code{vcpkg} tree at build time in order to be used in Cargo build scripts.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-version-check +(define-public rust-version-check-0.9 (package (name "rust-version-check") (version "0.9.1") @@ -4235,7 +3825,7 @@ untrusted inputs in Rust.") (origin (method url-fetch) (uri (crate-uri "version_check" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1kikqlnggii1rvnxrbls55sc46lxvinz5k3giscgncjj4p87b1q7")))) @@ -4248,24 +3838,25 @@ version requirements. The version is queried by calling the Rust compiler with @code{--version}. The path to the compiler is determined first via the @code{RUSTC} environment variable. If it is not set, then @code{rustc} is used. If that fails, no determination is made, and calls return None.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) (define-public rust-version-check-0.1 (package - (inherit rust-version-check) + (inherit rust-version-check-0.9) (name "rust-version-check") (version "0.1.5") (source (origin (method url-fetch) (uri (crate-uri "version_check" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1pf91pvj8n6akh7w6j5ypka6aqz08b3qpzgs0ak2kjf4frkiljwi")))))) -(define-public rust-void +(define-public rust-void-1.0 (package (name "rust-void") (version "1.0.2") @@ -4273,7 +3864,7 @@ If that fails, no determination is made, and calls return None.") (origin (method url-fetch) (uri (crate-uri "void" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0zc8f0ksxvmhvgx4fdg0zyn6vdnbxd2xv9hfx4nhzg6kbs4f80ka")))) @@ -4282,9 +3873,10 @@ If that fails, no determination is made, and calls return None.") (synopsis "Void type for use in statically impossible cases") (description "The uninhabited void type for use in statically impossible cases.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-walkdir +(define-public rust-walkdir-2.2 (package (name "rust-walkdir") (version "2.2.9") @@ -4292,25 +3884,19 @@ If that fails, no determination is made, and calls return None.") (origin (method url-fetch) (uri (crate-uri "walkdir" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "07ppalpvxkf8cnqr64np422792y4z5bs9m8b4nrflh5rm17wjn4n")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-same-file" ,rust-same-file) - ("rust-winapi" ,rust-winapi) - ("rust-winapi-util" ,rust-winapi-util)) - #:cargo-development-inputs - (("rust-doc-comment" ,rust-doc-comment)))) (home-page "https://github.com/BurntSushi/walkdir") (synopsis "Recursively walk a directory") (description "Recursively walk a directory.") + (properties '((hidden? . #t))) (license (list license:unlicense license:expat)))) -(define-public rust-wasi +(define-public rust-wasi-0.5 (package (name "rust-wasi") (version "0.5.0") @@ -4319,7 +3905,7 @@ If that fails, no determination is made, and calls return None.") (method url-fetch) (uri (crate-uri "wasi" version)) (file-name - (string-append name "-" version ".tar.gz")) + (string-append name "-" version ".crate")) (sha256 (base32 "1ir3pd4phdfml0cbziw9bqp7mnk0vfp9biy8bh25lln6raml4m7x")))) @@ -4328,9 +3914,10 @@ If that fails, no determination is made, and calls return None.") (synopsis "Experimental WASI API bindings for Rust") (description "This package contains experimental WASI API bindings in Rust.") + (properties '((hidden? . #t))) (license license:asl2.0))) -(define-public rust-wasm-bindgen-shared +(define-public rust-wasm-bindgen-shared-0.2 (package (name "rust-wasm-bindgen-shared") (version "0.2.48") @@ -4338,7 +3925,7 @@ in Rust.") (origin (method url-fetch) (uri (crate-uri "wasm-bindgen-shared" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "08rnfhjyk0f6liv8n4rdsvhx7r02glkhcbj2lp9lcbkbfpad9hnr")))) @@ -4347,10 +3934,11 @@ in Rust.") (synopsis "Shared support between wasm-bindgen and wasm-bindgen cli") (description "This package provides shared support between @code{wasm-bindgen} and @code{wasm-bindgen} cli, an internal dependency.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-wasm-bindgen-test-macro +(define-public rust-wasm-bindgen-test-macro-0.2 (package (name "rust-wasm-bindgen-test-macro") (version "0.2.48") @@ -4358,23 +3946,20 @@ in Rust.") (origin (method url-fetch) (uri (crate-uri "wasm-bindgen-test-macro" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0n28mr6vncf1k1qr2b5bvfxq4jvqkjdzq0z0ab6w2f5d6v8q3q3l")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-proc-macro2" ,rust-proc-macro2) - ("rust-quote" ,rust-quote)))) (home-page "https://github.com/rustwasm/wasm-bindgen") (synopsis "Internal testing macro for wasm-bindgen") (description "This library contains the internal testing macro for wasm-bindgen.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-widestring +(define-public rust-widestring-0.4 (package (name "rust-widestring") (version "0.4.0") @@ -4382,24 +3967,22 @@ in Rust.") (origin (method url-fetch) (uri (crate-uri "widestring" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1dhx6dndjsz1y7c9w06922412kdxyrrkqblvggm76mh8z17hxz7g")))) (build-system cargo-build-system) - (arguments - `(#:cargo-development-inputs - (("rust-winapi" ,rust-winapi)))) (home-page "https://github.com/starkat99/widestring-rs") (synopsis "Wide string Rust FFI library") (description "A wide string Rust FFI library for converting to and from wide strings, such as those often used in Windows API or other FFI libraries. Both UTF-16 and UTF-32 types are provided, including support for malformed encoding.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-winapi +(define-public rust-winapi-0.3 (package (name "rust-winapi") (version "0.3.8") @@ -4407,46 +3990,34 @@ UTF-32 types are provided, including support for malformed encoding.") (origin (method url-fetch) (uri (crate-uri "winapi" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1ii9j9lzrhwri0902652awifzx9fpayimbp6hfhhc296xcg0k4w0")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-winapi-i686-pc-windows-gnu" - ,rust-winapi-i686-pc-windows-gnu) - ("rust-winapi-x86-64-pc-windows-gnu" - ,rust-winapi-x86-64-pc-windows-gnu)))) (home-page "https://github.com/retep998/winapi-rs") (synopsis "Raw FFI bindings for all of Windows API.") (description "Raw FFI bindings for all of Windows API.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) (define-public rust-winapi-0.2 (package - (inherit rust-winapi) + (inherit rust-winapi-0.3) (name "rust-winapi") (version "0.2.8") (source (origin (method url-fetch) (uri (crate-uri "winapi" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0yh816lh6lf56dpsgxy189c2ai1z3j8mw9si6izqb6wsjkbcjz8n")))) - ;; We do not want to package 48 -sys crates for a package we do not want. - ;; They are all dev dependencies, so we skip building and testing. - (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'build)))))) + "0yh816lh6lf56dpsgxy189c2ai1z3j8mw9si6izqb6wsjkbcjz8n")))))) -(define-public rust-winapi-build +(define-public rust-winapi-build-0.1 (package (name "rust-winapi-build") (version "0.1.1") @@ -4454,7 +4025,7 @@ UTF-32 types are provided, including support for malformed encoding.") (origin (method url-fetch) (uri (crate-uri "winapi-build" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1g4rqsgjky0a7530qajn2bbfcrl2v0zb39idgdws9b1l7gp5wc9d")))) @@ -4463,9 +4034,10 @@ UTF-32 types are provided, including support for malformed encoding.") (synopsis "Common code for build.rs in WinAPI -sys crates") (description "Common code for build.rs in WinAPI -sys crates.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-winapi-i686-pc-windows-gnu +(define-public rust-winapi-i686-pc-windows-gnu-0.4 (package (name "rust-winapi-i686-pc-windows-gnu") (version "0.4.0") @@ -4473,7 +4045,7 @@ UTF-32 types are provided, including support for malformed encoding.") (origin (method url-fetch) (uri (crate-uri "winapi-i686-pc-windows-gnu" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1dmpa6mvcvzz16zg6d5vrfy4bxgg541wxrcip7cnshi06v38ffxc")))) @@ -4483,10 +4055,11 @@ UTF-32 types are provided, including support for malformed encoding.") (description "This crate provides import libraries for the i686-pc-windows-gnu target. Please don't use this crate directly, depend on @code{winapi} instead.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-winapi-util +(define-public rust-winapi-util-0.1 (package (name "rust-winapi-util") (version "0.1.2") @@ -4494,22 +4067,21 @@ i686-pc-windows-gnu target. Please don't use this crate directly, depend on (origin (method url-fetch) (uri (crate-uri "winapi-util" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1j839dc6y8vszvrsb7yk0qvs0w6asnahxzbyans37vnsw6vbls3i")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs (("rust-winapi" ,rust-winapi)))) (home-page "https://github.com/BurntSushi/winapi-util") (synopsis "Dumping ground for high level safe wrappers over winapi") (description "This package provides a dumping ground for high level safe wrappers over winapi.") + (properties '((hidden? . #t))) (license (list license:unlicense license:expat)))) -(define-public rust-winapi-x86-64-pc-windows-gnu +(define-public rust-winapi-x86-64-pc-windows-gnu-0.4 (package (name "rust-winapi-x86-64-pc-windows-gnu") (version "0.4.0") @@ -4517,7 +4089,7 @@ winapi.") (origin (method url-fetch) (uri (crate-uri "winapi-x86_64-pc-windows-gnu" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0gqq64czqb64kskjryj8isp62m2sgvx25yyj3kpc2myh85w24bki")))) @@ -4527,10 +4099,11 @@ winapi.") (description "This package provides import libraries for the x86_64-pc-windows-gnu target. Please don't use this crate directly, depend on @code{winapi} instead.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-wincolor +(define-public rust-wincolor-1.0 (package (name "rust-wincolor") (version "1.0.2") @@ -4538,24 +4111,21 @@ x86_64-pc-windows-gnu target. Please don't use this crate directly, depend on (origin (method url-fetch) (uri (crate-uri "wincolor" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "1agaf3hcav113i86912ajnw6jxcy4rvkrgyf8gdj8kc031mh3xcn")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-winapi" ,rust-winapi) - ("rust-winapi-util" ,rust-winapi-util)))) (home-page "https://github.com/BurntSushi/termcolor/tree/master/wincolor") (synopsis "Windows API for controlling text color in a Windows console") (description "This package provides a simple Windows specific API for controlling text color in a Windows console.") + (properties '((hidden? . #t))) (license (list license:unlicense license:expat)))) -(define-public rust-winutil +(define-public rust-winutil-0.1 (package (name "rust-winutil") (version "0.1.1") @@ -4563,26 +4133,19 @@ color in a Windows console.") (origin (method url-fetch) (uri (crate-uri "winutil" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0vkyl3fbbf05n5ph5yz8sfaccrk9x3qsr25560w6w68ldf5i7bvx")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-winapi" ,rust-winapi)) - ;; This unmaintained crate cannot find winapi when built directly. - #:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'build)))) (home-page "https://bitbucket.org/DaveLancaster/winutil") (synopsis "Library wrapping a handful of useful winapi functions") (description "A simple library wrapping a handful of useful winapi functions.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-ws2-32-sys +(define-public rust-ws2-32-sys-0.2 (package (name "rust-ws2-32-sys") (version "0.2.1") @@ -4590,29 +4153,19 @@ color in a Windows console.") (origin (method url-fetch) (uri (crate-uri "ws2_32-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0ppscg5qfqaw0gzwv2a4nhn5bn01ff9iwn6ysqnzm4n8s3myz76m")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-winapi" ,rust-winapi-0.2) - ("rust-winapi-build" ,rust-winapi-build)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-Cargo-toml - (lambda _ - (substitute* "Cargo.toml" - ((", path =.* }") "}\n")) - #t))))) (home-page "https://github.com/retep998/winapi-rs") (synopsis "Function definitions for the Windows API library ws2_32") (description "Contains function definitions for the Windows API library ws2_32.") + (properties '((hidden? . #t))) (license license:expat))) -(define-public rust-xattr +(define-public rust-xattr-0.2 (package (name "rust-xattr") (version "0.2.2") @@ -4620,26 +4173,21 @@ color in a Windows console.") (origin (method url-fetch) (uri (crate-uri "xattr" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0k556fb6f5jc907975j9c8iynl2fqz3rf0w6fiig83i4yi0kfk14")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc)) - #:cargo-development-inputs - (("rust-tempfile" ,rust-tempfile)) - #:tests? #f)) ; Tests assume read access to /var. (home-page "https://github.com/Stebalien/xattr") (synopsis "Unix extended filesystem attributes") (description "This package provide a small library for setting, getting, and listing extended attributes.") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -(define-public rust-xdg +(define-public rust-xdg-2.2 (package (name "rust-xdg") (version "2.2.0") @@ -4647,7 +4195,7 @@ extended attributes.") (origin (method url-fetch) (uri (crate-uri "xdg" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 "0mws8a0fr3cqk5nh7aq9lmkmhzghvasqy4mhw6nnza06l4d6i2fh")))) @@ -4657,5 +4205,6 @@ extended attributes.") (description "This package provides a library for storing and retrieving files according to XDG Base Directory specification") + (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 07c9fd36d6cd3400980ec362ce493d8ae0918bf8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 27 Oct 2019 21:23:39 +0200 Subject: gnu: Merge all crates into (gnu packages crates-io). * gnu/packages/rust-cbindgen.scm: Move all crates ... * gnu/packages/crates-io.scm: ... to here. --- gnu/packages/crates-io.scm | 589 ++++++++++++++++++++++++-- gnu/packages/rust-cbindgen.scm | 938 +---------------------------------------- 2 files changed, 553 insertions(+), 974 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7b34b70600..b4bb599dcc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -119,7 +119,7 @@ text or blue underlined text, on ANSI terminals.") (define-public rust-autocfg-0.1 (package (name "rust-autocfg") - (version "0.1.5") + (version "0.1.7") (source (origin (method url-fetch) @@ -127,7 +127,7 @@ text or blue underlined text, on ANSI terminals.") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0asl6fnc35yk5l2rxwhp25v128jgm45dp754h9z8x51b6n90w4r2")))) + "1chwgimpx5z7xbag7krr9d8asxfqbh683qhgl9kn3hxk2l0djj8x")))) (build-system cargo-build-system) (home-page "https://github.com/cuviper/autocfg") (synopsis "Automatic cfg for Rust compiler features") @@ -312,7 +312,7 @@ archive to be linked into Rustcode.") (define-public rust-cfg-if-0.1 (package (name "rust-cfg-if") - (version "0.1.9") + (version "0.1.10") (source (origin (method url-fetch) @@ -320,7 +320,7 @@ archive to be linked into Rustcode.") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0csygklgz3ybpr0670rkip49zh76m43ar3k7xgypkzbzrwycx1ml")))) + "08h80ihs74jcyp24cd75wwabygbbdgl05k6p5dmq8akbr78vv1a7")))) (build-system cargo-build-system) (home-page "https://github.com/alexcrichton/cfg-if") (synopsis "Define an item depending on parameters") @@ -376,6 +376,27 @@ depending on a large number of #[cfg] parameters. Structured like an (base32 "1r50dwy5hj5gq07dn0qf8222d07qv0970ymx0j8n9779yayc3w3f")))))) +(define-public rust-clap-2 + (package + (name "rust-clap") + (version "2.33.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "clap" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "1nf6ld3bims1n5vfzhkvcb55pdzh04bbhzf8nil5vvw05nxzarsh")))) + (build-system cargo-build-system) + (home-page "https://clap.rs/") + (synopsis "Command Line Argument Parser") + (description + "This package provides a simple to use, efficient, and full-featured +Command Line Argument Parser.") + (properties '((hidden? . #t))) + (license license:expat))) + (define-public rust-clicolors-control-1.0 (package (name "rust-clicolors-control") @@ -1376,16 +1397,15 @@ requires non-const function calls to be computed.") (define-public rust-libc-0.2 (package (name "rust-libc") - (version "0.2.62") + (version "0.2.65") (source (origin (method url-fetch) (uri (crate-uri "libc" version)) - (file-name - (string-append name "-" version ".crate")) + (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1fh69kpjg8hqff36kdczx7sax98gk4qs4ws1dwvjz0rgip0d5z1l")))) + "1s14bjxnz6haw0gr1h3j4sr7s2s407hpgm8dxhwnl7yzgxia0c8s")))) (build-system cargo-build-system) (home-page "https://github.com/rust-lang/libc") (synopsis "Raw FFI bindings to platform libraries like libc") @@ -1540,10 +1560,10 @@ functions and static variables these libraries contain.") (license (list license:asl2.0 license:expat)))) -(define-public rust-log-0.3 +(define-public rust-log-0.4 (package (name "rust-log") - (version "0.3.8") + (version "0.4.8") (source (origin (method url-fetch) @@ -1551,15 +1571,28 @@ functions and static variables these libraries contain.") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0nsn28syc49vvjhxcfc8261rd1frhjc0r4bn9v3mqvps3ra7f3w8")))) + "1xz18ixccl5c6np4linv3ypc7hpmmgpc5zzd2ymp2ssfx0mhbdhl")))) (build-system cargo-build-system) - (home-page "https://github.com/rust-lang-nursery/log") - (synopsis "Lightweight logging") + (home-page "https://github.com/rust-lang/log") + (synopsis "Lightweight logging facade for Rust") (description - "This package provides a lightweight logging facade for Rust") + "This package provides a lightweight logging facade for Rust.") (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) + (license (list license:expat license:asl2.0)))) + +(define-public rust-log-0.3 + (package + (inherit rust-log-0.4) + (name "rust-log") + (version "0.3.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "log" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0nsn28syc49vvjhxcfc8261rd1frhjc0r4bn9v3mqvps3ra7f3w8")))))) (define-public rust-lzma-sys-0.1 (package @@ -2058,6 +2091,26 @@ implementation (which is unstable / requires nightly).") "0c9whknf2dm74a3cqirafy6gj83a76gl56g4v3g19k6lkwz13rcj")))) (build-system cargo-build-system))) +(define-public rust-numtoa-0.1 + (package + (name "rust-numtoa") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "numtoa" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "1vs9rhggqbql1p26x8nkha1j06wawwgb2jp5fs88b5gi7prvvy5q")))) + (build-system cargo-build-system) + (home-page "https://gitlab.com/mmstick/numtoa") + (synopsis "Convert numbers into stack-allocated byte arrays") + (description + "This package can convert numbers into stack-allocated byte arrays.") + (properties '((hidden? . #t))) + (license (list license:expat license:asl2.0)))) + (define-public rust-openssl-probe-0.1 (package (name "rust-openssl-probe") @@ -2402,19 +2455,18 @@ for x86.") (license (list license:asl2.0 license:expat)))) -(define-public rust-proc-macro2-0.4 +(define-public rust-proc-macro2-1.0 (package (name "rust-proc-macro2") - (version "0.4.30") + (version "1.0.6") (source (origin (method url-fetch) (uri (crate-uri "proc-macro2" version)) - (file-name - (string-append name "-" version ".crate")) + (file-name (string-append name "-" version ".crate")) (sha256 - (base32 - "0nd71fl24sys066jrha6j7i34nfkjv44yzw8yww9742wmc8j0gfg")))) + (base32 + "09rgb5ab0jgw39kyad0lgqs4nb9yaf7mwcrgxqnsxbn4il54g7lw")))) (build-system cargo-build-system) (home-page "https://github.com/alexcrichton/proc-macro2") (synopsis "Stable implementation of the upcoming new `proc_macro` API") @@ -2422,9 +2474,22 @@ for x86.") `proc_macro` API. Comes with an option, off by default, to also reimplement itself in terms of the upstream unstable API.") (properties '((hidden? . #t))) - ;; Dual licensed. (license (list license:asl2.0 license:expat)))) +(define-public rust-proc-macro2-0.4 + (package + (inherit rust-proc-macro2-1.0) + (name "rust-proc-macro2") + (version "0.4.30") + (source + (origin + (method url-fetch) + (uri (crate-uri "proc-macro2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0nd71fl24sys066jrha6j7i34nfkjv44yzw8yww9742wmc8j0gfg")))))) + (define-public rust-quick-error-1.2 (package (name "rust-quick-error") @@ -2446,31 +2511,43 @@ to write.") (license (list license:asl2.0 license:expat)))) -(define-public rust-quote-0.6 +(define-public rust-quote-1.0 (package (name "rust-quote") - (version "0.6.12") + (version "1.0.2") (source (origin (method url-fetch) (uri (crate-uri "quote" version)) - (file-name - (string-append name "-" version ".crate")) + (file-name (string-append name "-" version ".crate")) (sha256 - (base32 - "1nw0klza45hf127kfyrpxsxd5jw2l6h21qxalil3hkr7bnf7kx7s")))) + (base32 + "1zkc46ryacf2jdkc6krsy2z615xbk1x8kp1830rcxz3irj5qqfh5")))) (build-system cargo-build-system) (home-page "https://github.com/dtolnay/quote") (synopsis "Quasi-quoting macro quote!(...)") (description "Quasi-quoting macro quote!(...)") (properties '((hidden? . #t))) - ;; Dual licensed. (license (list license:asl2.0 license:expat)))) -(define-public rust-rand-0.4 +(define-public rust-quote-0.6 + (package + (inherit rust-quote-1.0) + (name "rust-quote") + (version "0.6.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "quote" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1nw0klza45hf127kfyrpxsxd5jw2l6h21qxalil3hkr7bnf7kx7s")))))) + +(define-public rust-rand-0.6 (package (name "rust-rand") - (version "0.4.3") + (version "0.6.5") (source (origin (method url-fetch) @@ -2478,7 +2555,7 @@ to write.") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1gfgnqfj2pyh27dcb720jpawskllwnbvxh816ddyykv269xz8ml3")))) + "1jl4449jcl4wgmzld6ffwqj5gwxrp8zvx8w573g1z368qg6xlwbd")))) (build-system cargo-build-system) (home-page "https://crates.io/crates/rand") (synopsis "Random number generators and other randomness functionality") @@ -2489,9 +2566,23 @@ useful types and distributions, and some randomness-related algorithms.") (license (list license:asl2.0 license:expat)))) +(define-public rust-rand-0.4 + (package + (inherit rust-rand-0.6) + (name "rust-rand") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1gfgnqfj2pyh27dcb720jpawskllwnbvxh816ddyykv269xz8ml3")))))) + (define-public rust-rand-0.3 (package - (inherit rust-rand-0.4) + (inherit rust-rand-0.6) (name "rust-rand") (version "0.3.23") (source @@ -2503,6 +2594,190 @@ useful types and distributions, and some randomness-related algorithms.") (base32 "0v679h38pjjqj5h4md7v2slsvj6686qgcn7p9fbw3h43iwnk1b34")))))) +(define-public rust-rand-chacha-0.1 + (package + (name "rust-rand-chacha") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_chacha" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "1vxwyzs4fy1ffjc8l00fsyygpiss135irjf7nyxgq2v0lqf3lvam")))) + (build-system cargo-build-system) + (home-page "https://crates.io/crates/rand_chacha") + (synopsis "ChaCha random number generator") + (description "ChaCha random number generator") + (properties '((hidden? . #t))) + (license (list license:asl2.0 + license:expat)))) + +(define-public rust-rand-core-0.4 + (package + (name "rust-rand-core") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_core" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "1p09ynysrq1vcdlmcqnapq4qakl2yd1ng3kxh3qscpx09k2a6cww")))) + (build-system cargo-build-system) + (home-page "https://crates.io/crates/rand_core") + (synopsis + "Core random number generator traits and tools for implementation.") + (description + "Core random number generator traits and tools for implementation.") + (properties '((hidden? . #t))) + (license (list license:asl2.0 + license:expat)))) + +(define-public rust-rand-core-0.3 + (package + (inherit rust-rand-core-0.4) + (name "rust-rand-core") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_core" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "0jzdgszfa4bliigiy4hi66k7fs3gfwi2qxn8vik84ph77fwdwvvs")))) + ;; This version is a 0.3 API wrapper around the 0.4 version. + (arguments + `(#:cargo-inputs (("rand-core" ,rust-rand-core-0.4)))))) + +(define-public rust-rand-hc-0.1 + (package + (name "rust-rand-hc") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_hc" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "1i0vl8q5ddvvy0x8hf1zxny393miyzxkwqnw31ifg6p0gdy6fh3v")))) + (build-system cargo-build-system) + (home-page "https://crates.io/crates/rand_hc") + (synopsis "HC128 random number generator") + (description "HC128 random number generator") + (properties '((hidden? . #t))) + (license (list license:asl2.0 + license:expat)))) + +(define-public rust-rand-isaac-0.1 + (package + (name "rust-rand-isaac") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_isaac" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "027flpjr4znx2csxk7gxb7vrf9c7y5mydmvg5az2afgisp4rgnfy")))) + (build-system cargo-build-system) + (home-page "https://crates.io/crates/rand_isaac") + (synopsis "ISAAC random number generator") + (description "ISAAC random number generator") + (properties '((hidden? . #t))) + (license (list license:asl2.0 + license:expat)))) + +(define-public rust-rand-jitter-0.1 + (package + (name "rust-rand-jitter") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_jitter" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "16z387y46bfz3csc42zxbjq89vcr1axqacncvv8qhyy93p4xarhi")))) + (build-system cargo-build-system) + (home-page "https://github.com/rust-random/rand") + (synopsis + "Random number generator based on timing jitter") + (description + "Random number generator based on timing jitter") + (properties '((hidden? . #t))) + (license (list license:asl2.0 + license:expat)))) + +(define-public rust-rand-os-0.1 + (package + (name "rust-rand-os") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_os" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "0wahppm0s64gkr2vmhcgwc0lij37in1lgfxg5rbgqlz0l5vgcxbv")))) + (build-system cargo-build-system) + (home-page "https://crates.io/crates/rand_os") + (synopsis "OS backed Random Number Generator") + (description "OS backed Random Number Generator") + (properties '((hidden? . #t))) + (license (list license:asl2.0 + license:expat)))) + +(define-public rust-rand-pcg-0.1 + (package + (name "rust-rand-pcg") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_pcg" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "0i0bdla18a8x4jn1w0fxsbs3jg7ajllz6azmch1zw33r06dv1ydb")))) + (build-system cargo-build-system) + (home-page "https://crates.io/crates/rand_pcg") + (synopsis + "Selected PCG random number generators") + (description + "Selected PCG random number generators") + (properties '((hidden? . #t))) + (license (list license:asl2.0 + license:expat)))) + +(define-public rust-rand-xorshift-0.1 + (package + (name "rust-rand-xorshift") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_xorshift" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "0p2x8nr00hricpi2m6ca5vysiha7ybnghz79yqhhx6sl4gkfkxyb")))) + (build-system cargo-build-system) + (home-page "https://crates.io/crates/rand_xorshift") + (synopsis "Xorshift random number generator") + (description + "Xorshift random number generator") + (properties '((hidden? . #t))) + (license (list license:asl2.0 + license:expat)))) + (define-public rust-rawpointer-0.1 (package (name "rust-rawpointer") @@ -2525,6 +2800,27 @@ and @code{ptrdistance}.") (license (list license:asl2.0 license:expat)))) +(define-public rust-rdrand-0.4 + (package + (name "rust-rdrand") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rdrand" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "1cjq0kwx1bk7jx3kzyciiish5gqsj7620dm43dc52sr8fzmm9037")))) + (build-system cargo-build-system) + (home-page "https://github.com/nagisa/rust_rdrand/") + (synopsis "Random number generator") + (description + "This package is an implementation of random number generator based on +@code{rdrand} and @cpde{rdseed} instructions") + (properties '((hidden? . #t))) + (license license:isc))) + ;; This package requires features which are unavailable ;; on the stable releases of Rust. (define-public rust-redox-syscall-0.1 @@ -2547,6 +2843,26 @@ system calls.") (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-redox-termios-0.1 + (package + (name "rust-redox-termios") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "redox-termios" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "0xhgvdh62mymgdl3jqrngl8hr4i8xwpnbsxnldq0l47993z1r2by")))) + (build-system cargo-build-system) + (home-page "https://github.com/redox-os/termios") + (synopsis "Rust library to access Redox termios functions") + (description + "This package provides a Rust library to access Redox termios functions.") + (properties '((hidden? . #t))) + (license license:expat))) + (define-public rust-regex-syntax-0.6 (package (name "rust-regex-syntax") @@ -2698,6 +3014,27 @@ rust-lang/rust integration.") (license (list license:asl2.0 license:expat)))) +(define-public rust-ryu-1.0 + (package + (name "rust-ryu") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "ryu" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "1j0h74f1xqf9hjkhanp8i20mqc1aw35kr1iq9i79q7713mn51a5z")))) + (build-system cargo-build-system) + (home-page "https://github.com/dtolnay/ryu") + (synopsis + "Fast floating point to string conversion") + (description + "Fast floating point to string conversion") + (properties '((hidden? . #t))) + (license (list license:asl2.0 license:boost1.0)))) + (define-public rust-safemem-0.3 (package (name "rust-safemem") @@ -2918,6 +3255,67 @@ with one of the implemented strategies.") (base32 "18vhypw6zgccnrlm5ps1pwa0khz7ry927iznpr88b87cagr1v2iq")))))) +(define-public rust-serde-1.0 + (package + (name "rust-serde") + (version "1.0.101") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "1p8r24hagcsrl92w5z32nfrg9040qkgqf8iwwnf7mzigpavwk5lp")))) + (build-system cargo-build-system) + (home-page "https://serde.rs") + (synopsis "Generic serialization/deserialization framework") + (description + "This package provides a generic serialization/deserialization framework.") + (properties '((hidden? . #t))) + (license (list license:expat license:asl2.0)))) + +(define-public rust-serde-derive-1.0 + (package + (name "rust-serde-derive") + (version "1.0.101") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde-derive" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "0bn0wz3j48248187mfmypyqnh73mq734snxxhr05vmgcl51kl4sb")))) + (build-system cargo-build-system) + (home-page "https://serde.rs") + (synopsis + "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]") + (description + "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]") + (properties '((hidden? . #t))) + (license (list license:expat license:asl2.0)))) + +(define-public rust-serde-json-1.0 + (package + (name "rust-serde-json") + (version "1.0.41") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde-json" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "1hipk84x40454mf599752mi7l08wb8qakz8vd6d3zp57d0mfnwig")))) + (build-system cargo-build-system) + (home-page "https://github.com/serde-rs/json") + (synopsis "A JSON serialization file format") + (description + "This package provides a JSON serialization file format.") + (properties '((hidden? . #t))) + (license (list license:expat license:asl2.0)))) + (define-public rust-shlex-0.1 (package (name "rust-shlex") @@ -3190,6 +3588,25 @@ and Jaro-Winkler.") (base32 "0sjsm7hrvjdifz661pjxq5w4hf190hx53fra8dfvamacvff139cf")))))) +(define-public rust-syn-1.0 + (package + (name "rust-syn") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "syn" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "1gw03w7lzrlqmp2vislcybikgl5wkhrqi6sy70w93xss2abhx1b6")))) + (build-system cargo-build-system) + (home-page "https://github.com/dtolnay/syn") + (synopsis "Parser for Rust source code") + (description "Parser for Rust source code") + (properties '((hidden? . #t))) + (license (list license:expat license:asl2.0)))) + (define-public rust-synstructure-test-traits-0.1 (package (name "rust-synstructure-test-traits") @@ -3260,7 +3677,7 @@ deleting all contents when it's dropped.") (define-public rust-tempfile-3.0 (package (name "rust-tempfile") - (version "3.0.2") + (version "3.0.8") (source (origin (method url-fetch) @@ -3268,7 +3685,7 @@ deleting all contents when it's dropped.") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0ny1cdbcsrmwjpy4k9366xm6p0jqkrmrvr0cln2djxspp1inyxs7")))) + "1vqk7aq2l04my2r3jiyyxirnf8f90nzcvjasvrajivb85s7p7i3x")))) (build-system cargo-build-system) (home-page "http://stebalien.com/projects/tempfile-rs") (synopsis "Library for managing temporary files and directories") @@ -3321,6 +3738,26 @@ writing colored text to a terminal.") (license (list license:unlicense license:expat)))) +(define-public rust-termion-1.5 + (package + (name "rust-termion") + (version "1.5.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "termion" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "0c634rg520zjjfhwnxrc2jbfjz7db0rcpsjs1qici0nyghpv53va")))) + (build-system cargo-build-system) + (home-page "https://gitlab.redox-os.org/redox-os/termion") + (synopsis "Library for manipulating terminals") + (description + "This package provides a bindless library for manipulating terminals.") + (properties '((hidden? . #t))) + (license license:expat))) + (define-public rust-termios-0.3 (package (name "rust-termios") @@ -3344,6 +3781,29 @@ return values to @code{std::io::Result} to indicate success or failure.") (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-textwrap-0.11 + (package + (name "rust-textwrap") + (version "0.11.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "textwrap" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "0q5hky03ik3y50s9sz25r438bc4nwhqc6dqwynv4wylc807n29nk")))) + (build-system cargo-build-system) + (home-page "https://github.com/mgeisler/textwrap") + (synopsis "Library for word wrapping, indenting, and dedenting strings") + (description + "Textwrap is a small library for word wrapping, indenting, and dedenting +strings. You can use it to format strings (such as help and error messages) +for display in commandline applications. It is designed to be efficient and +handle Unicode characters correctly.") + (properties '((hidden? . #t))) + (license license:expat))) + (define-public rust-thread-id-3.3 (package (name "rust-thread-id") @@ -3449,6 +3909,30 @@ in Rust.") (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-toml-0.5 + (package + (name "rust-toml") + (version "0.5.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "toml" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "093p48vpqm4bb8q3514xsij0dkljxlr3jp9ypxr4p48xjisvxan7")))) + (build-system cargo-build-system) + (home-page "https://github.com/alexcrichton/toml-rs") + (synopsis "Rust encoder and decoder of TOML-formatted files and streams") + (description + "This package provides a native Rust encoder and decoder of TOML-formatted +files and streams. Provides implementations of the standard +Serialize/Deserialize traits for TOML data to facilitate deserializing and +serializing Rust structures.") + (properties '((hidden? . #t))) + (license (list license:asl2.0 + license:expat)))) + (define-public rust-tracing-core-0.1 (package (name "rust-tracing-core") @@ -3658,7 +4142,7 @@ with the Unicode character database.") (define-public rust-unicode-width-0.1 (package (name "rust-unicode-width") - (version "0.1.5") + (version "0.1.6") (source (origin (method url-fetch) @@ -3666,7 +4150,7 @@ with the Unicode character database.") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "09k5lipygardwy0660jhls08fsgknrazzivmn804gps53hiqc8w8")))) + "082f9hv1r3gcd1xl33whjhrm18p0w9i77zhhhkiccb5r47adn1vh")))) (build-system cargo-build-system) (home-page "https://github.com/unicode-rs/unicode-width") (synopsis "Determine displayed width according to Unicode rules") @@ -3817,6 +4301,27 @@ untrusted inputs in Rust.") (license (list license:asl2.0 license:expat)))) +(define-public rust-vec-map-0.8 + (package + (name "rust-vec-map") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "vec_map" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "06n8hw4hlbcz328a3gbpvmy0ma46vg1lc0r5wf55900szf3qdiq5")))) + (build-system cargo-build-system) + (home-page "https://github.com/contain-rs/vec-map") + (synopsis "Simple map based on a vector for small integer keys") + (description + "This package provides a simple map based on a vector for small integer keys.") + (properties '((hidden? . #t))) + (license (list license:asl2.0 + license:expat)))) + (define-public rust-version-check-0.9 (package (name "rust-version-check") @@ -3995,6 +4500,11 @@ UTF-32 types are provided, including support for malformed encoding.") (base32 "1ii9j9lzrhwri0902652awifzx9fpayimbp6hfhhc296xcg0k4w0")))) (build-system cargo-build-system) + ;; This package depends unconditionally on these two crates. + (arguments + `(#:cargo-inputs + (("winapi-i686-pc-windows-gnu" ,rust-winapi-i686-pc-windows-gnu-0.4) + ("winapi-x86-64-pc-windows-gnu" ,rust-winapi-x86-64-pc-windows-gnu-0.4)))) (home-page "https://github.com/retep998/winapi-rs") (synopsis "Raw FFI bindings for all of Windows API.") (description @@ -4015,7 +4525,8 @@ UTF-32 types are provided, including support for malformed encoding.") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0yh816lh6lf56dpsgxy189c2ai1z3j8mw9si6izqb6wsjkbcjz8n")))))) + "0yh816lh6lf56dpsgxy189c2ai1z3j8mw9si6izqb6wsjkbcjz8n")))) + (arguments '()))) (define-public rust-winapi-build-0.1 (package diff --git a/gnu/packages/rust-cbindgen.scm b/gnu/packages/rust-cbindgen.scm index 9d20310346..2590af913f 100644 --- a/gnu/packages/rust-cbindgen.scm +++ b/gnu/packages/rust-cbindgen.scm @@ -20,7 +20,8 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix build-system cargo)) + #:use-module (guix build-system cargo) + #:use-module (gnu packages crates-io)) (define-public rust-cbindgen (package @@ -50,7 +51,7 @@ (("ansi-term" ,rust-ansi-term-0.11) ("atty" ,rust-atty-0.2) ("autocfg" ,rust-autocfg-0.1) - ("bitflags" ,rust-bitflags-1.1) + ("bitflags" ,rust-bitflags-1) ("cfg-if" ,rust-cfg-if-0.1) ("cloudabi" ,rust-cloudabi-0.0) ("fuchsia-cprng" ,rust-fuchsia-cprng-0.1) @@ -84,936 +85,3 @@ (description "This package provides a tool for generating C/C++ bindings to Rust code.") (license license:mpl2.0))) - -;;; -;;;^L -;;; - -(define rust-ansi-term-0.11 - (package - (name "rust-ansi-term") - (version "0.11.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "ansi_term" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "16wpvrghvd0353584i1idnsgm0r3vchg8fyrm0x8ayv1rgvbljgf")))) - (build-system cargo-build-system) - (home-page "https://github.com/ogham/rust-ansi-term") - (synopsis "Library for ANSI terminal colours and styles") - (description - "This is a library for controlling colours and formatting, such as red bold -text or blue underlined text, on ANSI terminals.") - (properties '((hidden? . #t))) - (license license:expat))) - -(define rust-atty-0.2 - (package - (name "rust-atty") - (version "0.2.13") - (source - (origin - (method url-fetch) - (uri (crate-uri "atty" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "140sswp1bwqwc4zk80bxkbnfb3g936hgrb77g9g0k1zcld3wc0qq")))) - (build-system cargo-build-system) - (home-page "https://github.com/softprops/atty") - (synopsis "A simple interface for querying atty") - (description - "This package provides a simple interface for querying atty.") - (properties '((hidden? . #t))) - (license license:expat))) - -(define rust-autocfg-0.1 - (package - (name "rust-autocfg") - (version "0.1.7") - (source - (origin - (method url-fetch) - (uri (crate-uri "autocfg" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1chwgimpx5z7xbag7krr9d8asxfqbh683qhgl9kn3hxk2l0djj8x")))) - (build-system cargo-build-system) - (home-page "https://github.com/cuviper/autocfg") - (synopsis "Automatic cfg for Rust compiler features") - (description "Rust library for build scripts to automatically configure -code based on compiler support. Code snippets are dynamically tested to see -if the @code{rustc} will accept them, rather than hard-coding specific version -support.") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) - -(define rust-bitflags-1.1 - (package - (name "rust-bitflags") - (version "1.1.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "bitflags" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1zc1qb1hwsnl2d8rhzicsv9kqd5b2hwbrscrcfw5as4sfr35659x")))) - (build-system cargo-build-system) - (home-page "https://github.com/bitflags/bitflags") - (synopsis "Macro to generate structures which behave like bitflags") - (description "This package provides a macro to generate structures which -behave like a set of bitflags.") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) - -(define rust-cfg-if-0.1 - (package - (name "rust-cfg-if") - (version "0.1.10") - (source - (origin - (method url-fetch) - (uri (crate-uri "cfg-if" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "08h80ihs74jcyp24cd75wwabygbbdgl05k6p5dmq8akbr78vv1a7")))) - (build-system cargo-build-system) - (home-page "https://github.com/alexcrichton/cfg-if") - (synopsis "Define an item depending on parameters") - (description "This package provides a macro to ergonomically define an item -depending on a large number of #[cfg] parameters. Structured like an -@code{if-else} chain, the first matching branch is the item that gets emitted.") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) - -(define rust-clap-2 - (package - (name "rust-clap") - (version "2.33.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "clap" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1nf6ld3bims1n5vfzhkvcb55pdzh04bbhzf8nil5vvw05nxzarsh")))) - (build-system cargo-build-system) - (home-page "https://clap.rs/") - (synopsis "Command Line Argument Parser") - (description - "This package provides a simple to use, efficient, and full-featured -Command Line Argument Parser.") - (properties '((hidden? . #t))) - (license license:expat))) - -(define rust-cloudabi-0.0 - (package - (name "rust-cloudabi") - (version "0.0.3") - (source - (origin - (method url-fetch) - (uri (crate-uri "cloudabi" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "0kxcg83jlihy0phnd2g8c2c303px3l2p3pkjz357ll6llnd5pz6x")))) - (build-system cargo-build-system) - (home-page "https://nuxi.nl/cloudabi/") - (synopsis "Low level interface to CloudABI") - (description - "Low level interface to CloudABI. Contains all syscalls and related types.") - (properties '((hidden? . #t))) - (license license:bsd-2))) - -(define rust-fuchsia-cprng-0.1 - (package - (name "rust-fuchsia-cprng") - (version "0.1.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "fuchsia-cprng" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1fnkqrbz7ixxzsb04bsz9p0zzazanma8znfdqjvh39n14vapfvx0")))) - (build-system cargo-build-system) - (home-page "https://fuchsia.googlesource.com/fuchsia/+/master/garnet/public/rust/fuchsia-cprng") - (synopsis "Fuchsia cryptographically secure pseudorandom number generator") - (description "Thix package provides a rust crate for the Fuchsia -cryptographically secure pseudorandom number generator.") - (properties '((hidden? . #t))) - (license license:bsd-3))) - -(define rust-itoa-0.4 - (package - (name "rust-itoa") - (version "0.4.4") - (source - (origin - (method url-fetch) - (uri (crate-uri "itoa" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "0zvg2d9qv3avhf3d8ggglh6fdyw8kkwqg3r4622ly5yhxnvnc4jh")))) - (build-system cargo-build-system) - (home-page "https://github.com/dtolnay/itoa") - (synopsis "Fast functions for printing integer primitives") - (description "This crate provides fast functions for printing integer -primitives to an @code{io::Write}.") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) - -(define rust-libc-0.2 - (package - (name "rust-libc") - (version "0.2.65") - (source - (origin - (method url-fetch) - (uri (crate-uri "libc" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1s14bjxnz6haw0gr1h3j4sr7s2s407hpgm8dxhwnl7yzgxia0c8s")))) - (build-system cargo-build-system) - (home-page "https://github.com/rust-lang/libc") - (synopsis "Raw FFI bindings to platform libraries like libc") - (description - "libc provides all of the definitions necessary to easily -interoperate with C code (or \"C-like\" code) on each of the platforms -that Rust supports. This includes type definitions (e.g., c_int), -constants (e.g., EINVAL) as well as function headers (e.g., malloc). - -This crate exports all underlying platform types, functions, and -constants under the crate root, so all items are accessible as -@samp{libc::foo}. The types and values of all the exported APIs match -the platform that libc is compiled for.") - (properties '((hidden? . #t))) - (license (list license:expat - license:asl2.0)))) - -(define rust-log-0.4 - (package - (name "rust-log") - (version "0.4.8") - (source - (origin - (method url-fetch) - (uri (crate-uri "log" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1xz18ixccl5c6np4linv3ypc7hpmmgpc5zzd2ymp2ssfx0mhbdhl")))) - (build-system cargo-build-system) - (home-page "https://github.com/rust-lang/log") - (synopsis "Lightweight logging facade for Rust") - (description - "This package provides a lightweight logging facade for Rust.") - (properties '((hidden? . #t))) - (license (list license:expat license:asl2.0)))) - -(define rust-numtoa-0.1 - (package - (name "rust-numtoa") - (version "0.1.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "numtoa" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1vs9rhggqbql1p26x8nkha1j06wawwgb2jp5fs88b5gi7prvvy5q")))) - (build-system cargo-build-system) - (home-page "https://gitlab.com/mmstick/numtoa") - (synopsis "Convert numbers into stack-allocated byte arrays") - (description - "This package can convert numbers into stack-allocated byte arrays.") - (properties '((hidden? . #t))) - (license (list license:expat license:asl2.0)))) - -(define rust-proc-macro2-1.0 - (package - (name "rust-proc-macro2") - (version "1.0.6") - (source - (origin - (method url-fetch) - (uri (crate-uri "proc-macro2" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "09rgb5ab0jgw39kyad0lgqs4nb9yaf7mwcrgxqnsxbn4il54g7lw")))) - (build-system cargo-build-system) - (home-page "https://github.com/alexcrichton/proc-macro2") - (synopsis "Stable implementation of the upcoming new `proc_macro` API") - (description "This package provides a stable implementation of the upcoming new -`proc_macro` API. Comes with an option, off by default, to also reimplement itself -in terms of the upstream unstable API.") - (properties '((hidden? . #t))) - (license (list license:expat license:asl2.0)))) - -(define rust-quote-1.0 - (package - (name "rust-quote") - (version "1.0.2") - (source - (origin - (method url-fetch) - (uri (crate-uri "quote" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1zkc46ryacf2jdkc6krsy2z615xbk1x8kp1830rcxz3irj5qqfh5")))) - (build-system cargo-build-system) - (home-page "https://github.com/dtolnay/quote") - (synopsis "Quasi-quoting macro quote!(...)") - (description "Quasi-quoting macro quote!(...)") - (properties '((hidden? . #t))) - (license (list license:expat license:asl2.0)))) - -(define rust-rand-0.6 - (package - (name "rust-rand") - (version "0.6.5") - (source - (origin - (method url-fetch) - (uri (crate-uri "rand" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1jl4449jcl4wgmzld6ffwqj5gwxrp8zvx8w573g1z368qg6xlwbd")))) - (build-system cargo-build-system) - (home-page "https://crates.io/crates/rand") - (synopsis "Random number generators and other randomness functionality") - (description - "This package contains random number generators and other randomness -functionality.") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) - -(define rust-rand-chacha-0.1 - (package - (name "rust-rand-chacha") - (version "0.1.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "rand_chacha" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1vxwyzs4fy1ffjc8l00fsyygpiss135irjf7nyxgq2v0lqf3lvam")))) - (build-system cargo-build-system) - (home-page "https://crates.io/crates/rand_chacha") - (synopsis "ChaCha random number generator") - (description "ChaCha random number generator") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) - -(define rust-rand-core-0.4 - (package - (name "rust-rand-core") - (version "0.4.2") - (source - (origin - (method url-fetch) - (uri (crate-uri "rand_core" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1p09ynysrq1vcdlmcqnapq4qakl2yd1ng3kxh3qscpx09k2a6cww")))) - (build-system cargo-build-system) - (home-page "https://crates.io/crates/rand_core") - (synopsis - "Core random number generator traits and tools for implementation.") - (description - "Core random number generator traits and tools for implementation.") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) - -(define rust-rand-core-0.3 - (package - (inherit rust-rand-core-0.4) - (name "rust-rand-core") - (version "0.3.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "rand_core" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "0jzdgszfa4bliigiy4hi66k7fs3gfwi2qxn8vik84ph77fwdwvvs")))) - ;; This version is a 0.3 API wrapper around the 0.4 version. - (arguments - `(#:cargo-inputs (("rand-core" ,rust-rand-core-0.4)))))) - -(define rust-rand-hc-0.1 - (package - (name "rust-rand-hc") - (version "0.1.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "rand_hc" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1i0vl8q5ddvvy0x8hf1zxny393miyzxkwqnw31ifg6p0gdy6fh3v")))) - (build-system cargo-build-system) - (home-page "https://crates.io/crates/rand_hc") - (synopsis "HC128 random number generator") - (description "HC128 random number generator") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) - -(define rust-rand-isaac-0.1 - (package - (name "rust-rand-isaac") - (version "0.1.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "rand_isaac" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "027flpjr4znx2csxk7gxb7vrf9c7y5mydmvg5az2afgisp4rgnfy")))) - (build-system cargo-build-system) - (home-page "https://crates.io/crates/rand_isaac") - (synopsis "ISAAC random number generator") - (description "ISAAC random number generator") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) - -(define rust-rand-jitter-0.1 - (package - (name "rust-rand-jitter") - (version "0.1.4") - (source - (origin - (method url-fetch) - (uri (crate-uri "rand_jitter" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "16z387y46bfz3csc42zxbjq89vcr1axqacncvv8qhyy93p4xarhi")))) - (build-system cargo-build-system) - (home-page "https://github.com/rust-random/rand") - (synopsis - "Random number generator based on timing jitter") - (description - "Random number generator based on timing jitter") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) - -(define rust-rand-os-0.1 - (package - (name "rust-rand-os") - (version "0.1.3") - (source - (origin - (method url-fetch) - (uri (crate-uri "rand_os" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "0wahppm0s64gkr2vmhcgwc0lij37in1lgfxg5rbgqlz0l5vgcxbv")))) - (build-system cargo-build-system) - (home-page "https://crates.io/crates/rand_os") - (synopsis "OS backed Random Number Generator") - (description "OS backed Random Number Generator") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) - -(define rust-rand-pcg-0.1 - (package - (name "rust-rand-pcg") - (version "0.1.2") - (source - (origin - (method url-fetch) - (uri (crate-uri "rand_pcg" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "0i0bdla18a8x4jn1w0fxsbs3jg7ajllz6azmch1zw33r06dv1ydb")))) - (build-system cargo-build-system) - (home-page "https://crates.io/crates/rand_pcg") - (synopsis - "Selected PCG random number generators") - (description - "Selected PCG random number generators") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) - -(define rust-rand-xorshift-0.1 - (package - (name "rust-rand-xorshift") - (version "0.1.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "rand_xorshift" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "0p2x8nr00hricpi2m6ca5vysiha7ybnghz79yqhhx6sl4gkfkxyb")))) - (build-system cargo-build-system) - (home-page "https://crates.io/crates/rand_xorshift") - (synopsis "Xorshift random number generator") - (description - "Xorshift random number generator") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) - -(define rust-rdrand-0.4 - (package - (name "rust-rdrand") - (version "0.4.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "rdrand" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1cjq0kwx1bk7jx3kzyciiish5gqsj7620dm43dc52sr8fzmm9037")))) - (build-system cargo-build-system) - (home-page "https://github.com/nagisa/rust_rdrand/") - (synopsis "Random number generator") - (description - "This package is an implementation of random number generator based on -@code{rdrand} and @cpde{rdseed} instructions") - (properties '((hidden? . #t))) - (license license:isc))) - -(define rust-redox-syscall-0.1 - (package - (name "rust-redox-syscall") - (version "0.1.56") - (source - (origin - (method url-fetch) - (uri (crate-uri "redox_syscall" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "110y7dyfm2vci4x5vk7gr0q551dvp31npl99fnsx2fb17wzwcf94")))) - (build-system cargo-build-system) - (home-page "https://gitlab.redox-os.org/redox-os/syscall") - (synopsis "Rust library to access raw Redox system calls") - (description "This package provides a Rust library to access raw Redox -system calls.") - (properties '((hidden? . #t))) - (license license:expat))) - -(define rust-redox-termios-0.1 - (package - (name "rust-redox-termios") - (version "0.1.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "redox-termios" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "0xhgvdh62mymgdl3jqrngl8hr4i8xwpnbsxnldq0l47993z1r2by")))) - (build-system cargo-build-system) - (home-page "https://github.com/redox-os/termios") - (synopsis "Rust library to access Redox termios functions") - (description - "This package provides a Rust library to access Redox termios functions.") - (properties '((hidden? . #t))) - (license license:expat))) - -(define rust-remove-dir-all-0.5 - (package - (name "rust-remove-dir-all") - (version "0.5.2") - (source - (origin - (method url-fetch) - (uri (crate-uri "remove-dir-all" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "0bkrlyg26mgizpiy1yb2hhpgscxcag8r5fnckqsvk25608vzm0sa")))) - (build-system cargo-build-system) - (home-page "https://github.com/XAMPPRocky/remove_dir_all.git") - (synopsis "Implementation of remove_dir_all for Windows") - (description - "This package provides a safe, reliable implementation of remove_dir_all -for Windows.") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) - -(define rust-ryu-1.0 - (package - (name "rust-ryu") - (version "1.0.2") - (source - (origin - (method url-fetch) - (uri (crate-uri "ryu" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1j0h74f1xqf9hjkhanp8i20mqc1aw35kr1iq9i79q7713mn51a5z")))) - (build-system cargo-build-system) - (home-page "https://github.com/dtolnay/ryu") - (synopsis - "Fast floating point to string conversion") - (description - "Fast floating point to string conversion") - (properties '((hidden? . #t))) - (license (list license:asl2.0 license:boost1.0)))) - -(define rust-serde-1.0 - (package - (name "rust-serde") - (version "1.0.101") - (source - (origin - (method url-fetch) - (uri (crate-uri "serde" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1p8r24hagcsrl92w5z32nfrg9040qkgqf8iwwnf7mzigpavwk5lp")))) - (build-system cargo-build-system) - (home-page "https://serde.rs") - (synopsis "Generic serialization/deserialization framework") - (description - "This package provides a generic serialization/deserialization framework.") - (properties '((hidden? . #t))) - (license (list license:expat license:asl2.0)))) - -(define rust-serde-derive-1.0 - (package - (name "rust-serde-derive") - (version "1.0.101") - (source - (origin - (method url-fetch) - (uri (crate-uri "serde-derive" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "0bn0wz3j48248187mfmypyqnh73mq734snxxhr05vmgcl51kl4sb")))) - (build-system cargo-build-system) - (home-page "https://serde.rs") - (synopsis - "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]") - (description - "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]") - (properties '((hidden? . #t))) - (license (list license:expat license:asl2.0)))) - -(define rust-serde-json-1.0 - (package - (name "rust-serde-json") - (version "1.0.41") - (source - (origin - (method url-fetch) - (uri (crate-uri "serde-json" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1hipk84x40454mf599752mi7l08wb8qakz8vd6d3zp57d0mfnwig")))) - (build-system cargo-build-system) - (home-page "https://github.com/serde-rs/json") - (synopsis "A JSON serialization file format") - (description - "This package provides a JSON serialization file format.") - (properties '((hidden? . #t))) - (license (list license:expat license:asl2.0)))) - -(define rust-strsim-0.8 - (package - (name "rust-strsim") - (version "0.8.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "strsim" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "0sjsm7hrvjdifz661pjxq5w4hf190hx53fra8dfvamacvff139cf")))) - (build-system cargo-build-system) - (home-page "https://github.com/dguo/strsim-rs") - (synopsis "Rust implementations of string similarity metrics") - (description "This crate includes implementations of string similarity -metrics. It includes Hamming, Levenshtein, OSA, Damerau-Levenshtein, Jaro, -and Jaro-Winkler.") - (properties '((hidden? . #t))) - (license license:expat))) - -(define rust-syn-1.0 - (package - (name "rust-syn") - (version "1.0.5") - (source - (origin - (method url-fetch) - (uri (crate-uri "syn" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1gw03w7lzrlqmp2vislcybikgl5wkhrqi6sy70w93xss2abhx1b6")))) - (build-system cargo-build-system) - (home-page "https://github.com/dtolnay/syn") - (synopsis "Parser for Rust source code") - (description "Parser for Rust source code") - (properties '((hidden? . #t))) - (license (list license:expat license:asl2.0)))) - -(define rust-tempfile-3.0 - (package - (name "rust-tempfile") - (version "3.0.8") - (source - (origin - (method url-fetch) - (uri (crate-uri "tempfile" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1vqk7aq2l04my2r3jiyyxirnf8f90nzcvjasvrajivb85s7p7i3x")))) - (build-system cargo-build-system) - (home-page "http://stebalien.com/projects/tempfile-rs") - (synopsis "Library for managing temporary files and directories") - (description - "This package provides a library for managing temporary files and -directories.") - (properties '((hidden? . #t))) - (license (list license:expat license:asl2.0)))) - -(define rust-termion-1.5 - (package - (name "rust-termion") - (version "1.5.3") - (source - (origin - (method url-fetch) - (uri (crate-uri "termion" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "0c634rg520zjjfhwnxrc2jbfjz7db0rcpsjs1qici0nyghpv53va")))) - (build-system cargo-build-system) - (home-page "https://gitlab.redox-os.org/redox-os/termion") - (synopsis "Library for manipulating terminals") - (description - "This package provides a bindless library for manipulating terminals.") - (properties '((hidden? . #t))) - (license license:expat))) - -(define rust-textwrap-0.11 - (package - (name "rust-textwrap") - (version "0.11.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "textwrap" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "0q5hky03ik3y50s9sz25r438bc4nwhqc6dqwynv4wylc807n29nk")))) - (build-system cargo-build-system) - (home-page "https://github.com/mgeisler/textwrap") - (synopsis "Library for word wrapping, indenting, and dedenting strings") - (description - "Textwrap is a small library for word wrapping, indenting, and dedenting -strings. You can use it to format strings (such as help and error messages) -for display in commandline applications. It is designed to be efficient and -handle Unicode characters correctly.") - (properties '((hidden? . #t))) - (license license:expat))) - -(define rust-toml-0.5 - (package - (name "rust-toml") - (version "0.5.3") - (source - (origin - (method url-fetch) - (uri (crate-uri "toml" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "093p48vpqm4bb8q3514xsij0dkljxlr3jp9ypxr4p48xjisvxan7")))) - (build-system cargo-build-system) - (home-page "https://github.com/alexcrichton/toml-rs") - (synopsis "Rust encoder and decoder of TOML-formatted files and streams") - (description - "This package provides a native Rust encoder and decoder of TOML-formatted -files and streams. Provides implementations of the standard -Serialize/Deserialize traits for TOML data to facilitate deserializing and -serializing Rust structures.") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) - -(define rust-unicode-width-0.1 - (package - (name "rust-unicode-width") - (version "0.1.6") - (source - (origin - (method url-fetch) - (uri (crate-uri "unicode-width" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "082f9hv1r3gcd1xl33whjhrm18p0w9i77zhhhkiccb5r47adn1vh")))) - (build-system cargo-build-system) - (home-page "https://github.com/unicode-rs/unicode-width") - (synopsis "Determine displayed width according to Unicode rules") - (description "This crate allows you to determine displayed width of -@code{char} and @code{str} types according to Unicode Standard Annex #11 rules.") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) - -(define rust-unicode-xid-0.2 - (package - (name "rust-unicode-xid") - (version "0.2.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "unicode-xid" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "0z09fn515xm7zyr0mmdyxa9mx2f7azcpv74pqmg611iralwpcvl2")))) - (build-system cargo-build-system) - (home-page "https://github.com/unicode-rs/unicode-xid") - (synopsis "Determine Unicode XID related properties") - (description "Determine whether characters have the XID_Start -or XID_Continue properties according to Unicode Standard Annex #31.") - (properties '((hidden? . #t))) - (license (list license:asl2.0 license:expat)))) - -(define rust-vec-map-0.8 - (package - (name "rust-vec-map") - (version "0.8.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "vec_map" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "06n8hw4hlbcz328a3gbpvmy0ma46vg1lc0r5wf55900szf3qdiq5")))) - (build-system cargo-build-system) - (home-page "https://github.com/contain-rs/vec-map") - (synopsis "Simple map based on a vector for small integer keys") - (description - "This package provides a simple map based on a vector for small integer keys.") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) - -(define rust-winapi-0.3 - (package - (name "rust-winapi") - (version "0.3.8") - (source - (origin - (method url-fetch) - (uri (crate-uri "winapi" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1ii9j9lzrhwri0902652awifzx9fpayimbp6hfhhc296xcg0k4w0")))) - (build-system cargo-build-system) - ;; This package depends unconditionally on these two crates. - (arguments - `(#:cargo-inputs - (("winapi-i686-pc-windows-gnu" ,rust-winapi-i686-pc-windows-gnu-0.4) - ("winapi-x86-64-pc-windows-gnu" ,rust-winapi-x86-64-pc-windows-gnu-0.4)))) - (home-page "https://github.com/retep998/winapi-rs") - (synopsis "Raw FFI bindings for all of Windows API") - (description - "This package contains raw FFI bindings for all of Windows API.") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) - -(define-public rust-winapi-i686-pc-windows-gnu-0.4 - (package - (name "rust-winapi-i686-pc-windows-gnu") - (version "0.4.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "winapi-i686-pc-windows-gnu" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1dmpa6mvcvzz16zg6d5vrfy4bxgg541wxrcip7cnshi06v38ffxc")))) - (build-system cargo-build-system) - (home-page "https://github.com/retep998/winapi-rs") - (synopsis "Import libraries for the i686-pc-windows-gnu target") - (description "This crate provides import libraries for the -i686-pc-windows-gnu target. Please don't use this crate directly, depend on -@code{winapi} instead.") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) - -(define rust-winapi-x86-64-pc-windows-gnu-0.4 - (package - (name "rust-winapi-x86-64-pc-windows-gnu") - (version "0.4.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "winapi-x86_64-pc-windows-gnu" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "0gqq64czqb64kskjryj8isp62m2sgvx25yyj3kpc2myh85w24bki")))) - (build-system cargo-build-system) - (home-page "https://github.com/retep998/winapi-rs") - (synopsis "Import libraries for the x86_64-pc-windows-gnu target") - (description "This package provides import libraries for the -x86_64-pc-windows-gnu target. Please don't use this crate directly, depend on -@code{winapi} instead.") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) -- cgit v1.2.3 From 4ba097b35fbea4b8313e8576dedbe18b1ab0d566 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 27 Oct 2019 21:43:14 +0100 Subject: gnu: perl-io-captureoutput: Update to 1.1105. * gnu/packages/perl.scm (perl-io-captureoutput): Update to 1.1105. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 97d754d405..d9adf7fe42 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -4287,7 +4287,7 @@ Perl IO idioms. It exports a single function called io, which returns a new (define-public perl-io-captureoutput (package (name "perl-io-captureoutput") - (version "1.1104") + (version "1.1105") (source (origin (method url-fetch) @@ -4296,8 +4296,7 @@ Perl IO idioms. It exports a single function called io, which returns a new version ".tar.gz")) (sha256 - (base32 - "0c437zvzpqi8f0h3nmblwdi2bvsb92b7g30fndr7my9qnky35izw")))) + (base32 "11zlfbahac09q3jvwmpijmkwgihwxps85jwy2q7q0wqjragh16df")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/IO-CaptureOutput") (synopsis "Capture STDOUT and STDERR from Perl code, subprocesses or XS") -- cgit v1.2.3 From a3dd88710f8a7a2cc334fddc94f3861ea392b336 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 27 Oct 2019 21:49:02 +0100 Subject: gnu: python-pathpy: Update to 11.5.1. * gnu/packages/python-xyz.scm (python-pathpy): Update to 11.5.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e69a17a463..7d084b7c0d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5218,13 +5218,13 @@ releases.") (define-public python-pathpy (package (name "python-pathpy") - (version "11.5.0") + (version "11.5.1") (source (origin (method url-fetch) (uri (pypi-uri "path.py" version)) (sha256 - (base32 "1jxkf91syzxlpiwgm83fjfz1m5xh3jrvv4iyl5wjsnkk599pls5n")))) + (base32 "0ir9j1haq2jbi7aip6k2fa9l7q1l03k4hp1awxhjhcwzsnwp3ll8")))) (outputs '("out" "doc")) (build-system python-build-system) (propagated-inputs -- cgit v1.2.3 From c34d0cd812aa4f0ce6f4438444bbad8c66bbb9e3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 27 Oct 2019 21:49:36 +0100 Subject: gnu: libasr: Don't use NAME in source URI. * gnu/packages/dns.scm (libasr)[source]: Hard-code NAME. --- gnu/packages/dns.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index b072a43e11..1c8a4245c4 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -278,7 +278,7 @@ the two.") (origin (method url-fetch) (uri (string-append "https://www.opensmtpd.org/archives/" - name "-" version ".tar.gz")) + "libasr-" version ".tar.gz")) (sha256 (base32 "18kdmbjsxrfai16d66qslp48b1zf7gr8him2jj5dcqgbsl44ls75")))) -- cgit v1.2.3 From ca1f4b19e983276391ae671cd764d0a5f261ef0e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 27 Oct 2019 20:40:37 +0100 Subject: gnu: unbound: Update to 1.9.4. * gnu/packages/dns.scm (unbound): Update to 1.9.4. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 1c8a4245c4..e120983f80 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -373,14 +373,14 @@ to result in system-wide compromise.") (define-public unbound (package (name "unbound") - (version "1.9.3") + (version "1.9.4") (source (origin (method url-fetch) (uri (string-append "https://www.unbound.net/downloads/unbound-" version ".tar.gz")) (sha256 - (base32 "1ykdy62sgzv33ggkmzwx2h0ifm7hyyxyfkb4zckv7gz4f28xsm8v")))) + (base32 "1c2bjm13x8bkw0ds1mhn9ivd2gzmfrb0x5y76bkz09a04bxjagix")))) (build-system gnu-build-system) (outputs '("out" "python")) (native-inputs -- cgit v1.2.3 From 6bc0bed18833bbcd1d0741f78b0aecf34122306c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 27 Oct 2019 21:06:11 +0100 Subject: gnu: retroarch: Update to 1.8.0. * gnu/packages/emulators.scm (retroarch): Update to 1.8.0. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 604214ecbd..b7ad855a8c 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1053,7 +1053,7 @@ emulation community. It provides highly accurate emulation.") (define-public retroarch (package (name "retroarch") - (version "1.7.9.2") + (version "1.8.0") (source (origin (method git-fetch) @@ -1062,7 +1062,7 @@ emulation community. It provides highly accurate emulation.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "14kay5g9rnm79mly7b4x5jwkidjaki8qqkpf21hnj1r2z1q7bp5b")))) + (base32 "1mgszd8gb5nk08kfykap9b1l5rl4qfy39dbba8crjj0zkc4z1jga")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 8f803775a639a50556427f3d2990b1ae1b0928b3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 19 Oct 2019 20:29:51 +0200 Subject: gnu: libmicrohttpd: Update to 0.9.68. * gnu/packages/gnunet.scm (libmicrohttpd): Update to 0.9.68. --- gnu/packages/gnunet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index e07702f994..0904022f08 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -147,14 +147,14 @@ tool to extract metadata from a file and print the results.") (define-public libmicrohttpd (package (name "libmicrohttpd") - (version "0.9.66") + (version "0.9.68") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-" version ".tar.gz")) (sha256 (base32 - "06xblz77bnn29y7sl43avxbcrjbw486x3416plpr3x3l2pdx8rjf")))) + "0q8bc4hrxn6llml7w2vam6n833x8injs39wgdkhwkawr50m6wwf5")))) (build-system gnu-build-system) (inputs `(("curl" ,curl) -- cgit v1.2.3 From da107cf5be52278da472f53f0671407bd5b6e015 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 27 Oct 2019 21:11:47 +0100 Subject: gnu: python-cftime: Update to 1.0.4.2. * gnu/packages/python-xyz.scm (python-cftime): Update to 1.0.4.2. --- gnu/packages/python-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7d084b7c0d..8ad5c92239 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -548,14 +548,13 @@ concepts.") (define-public python-cftime (package (name "python-cftime") - (version "1.0.3.4") + (version "1.0.4.2") (source (origin (method url-fetch) (uri (pypi-uri "cftime" version)) (sha256 - (base32 - "0362dhxbzk593walyjz30dll6y2y79wialik647cbwdsf3ad0x6x")))) + (base32 "0w0gi6jnch38hiygl62j4xkcirv4y3dcwrvxl9p7bsk6j27lzihs")))) (build-system python-build-system) (propagated-inputs `(("python-numpy" ,python-numpy))) -- cgit v1.2.3 From 6d18427fa5388e19f37ddeda13754fa10e8f7c55 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 27 Oct 2019 22:45:23 +0100 Subject: gnu: postgis: Update to 2.4.8. * gnu/packages/geo.scm (postgis): Update to 2.4.8. --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index bb9f897e51..5796db3eb9 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -634,14 +634,14 @@ utilities for data translation and processing.") (define-public postgis (package (name "postgis") - (version "2.4.4") + (version "2.4.8") (source (origin (method url-fetch) (uri (string-append "https://download.osgeo.org/postgis/source/postgis-" version ".tar.gz")) (sha256 (base32 - "1hm8migjb53cymp4qvg1h20yqllmy9f7x0awv5450391i6syyqq6")))) + "0nanza15xzfhbpbq49p1xqz96dgbsam5332y9zj6snmz2mq685ll")))) (build-system gnu-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From cf7648f882380dd7a4e82760ecc10cc6078498eb Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 27 Oct 2019 15:18:31 +0100 Subject: derivations: Introduce 'imported+compiled-modules'. * guix/derivations.scm (imported+compiled-modules): New procedure. (build-expression->derivation): Use it instead of separate calls to '%imported-modules' and '%compiled-modules'. --- guix/derivations.scm | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/guix/derivations.scm b/guix/derivations.scm index e1073ea39b..8309f845d9 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -1207,6 +1207,14 @@ they can refer to each other." #:guile-for-build guile #:local-build? #t))) +(define* (imported+compiled-modules store modules #:key + (system (%current-system)) + (guile (%guile-for-build))) + "Return a pair containing the derivation to import MODULES and that where +MODULES are compiled." + (cons (%imported-modules store modules #:system system #:guile guile) + (%compiled-modules store modules #:system system #:guile guile))) + (define* (build-expression->derivation store name exp ;deprecated #:key (system (%current-system)) @@ -1330,16 +1338,15 @@ and PROPERTIES." ;; fixed-output. (filter-map source-path inputs))) - (mod-drv (and (pair? modules) - (%imported-modules store modules - #:guile guile-drv - #:system system))) + (mod+go-drv (if (pair? modules) + (imported+compiled-modules store modules + #:guile guile-drv + #:system system) + '(#f . #f))) + (mod-drv (car mod+go-drv)) + (go-drv (cdr mod+go-drv)) (mod-dir (and mod-drv (derivation->output-path mod-drv))) - (go-drv (and (pair? modules) - (%compiled-modules store modules - #:guile guile-drv - #:system system))) (go-dir (and go-drv (derivation->output-path go-drv)))) (derivation store name guile -- cgit v1.2.3 From f726f6f8021e78b6a50ca0dbdb4acc91ed2161c4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 27 Oct 2019 15:24:41 +0100 Subject: derivations: 'build-expression->derivation' caches its module derivations. This reduces the number of lookups in the 'add-data-to-store' cache from 7505 to 3329 (hit rate from 68% to 27%) when running: GUIX_PROFILING=add-data-to-store-cache guix build libreoffice -nd The execution time of "guix build libreoffice -nd" goes from 2.12s to 1.87s. * guix/derivations.scm (%module-cache): New variable. (imported+compiled-modules)[key]: New variable. Lookup KEY in %MODULE-CACHE and populate %MODULE-CACHE upon cache miss. --- guix/derivations.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/guix/derivations.scm b/guix/derivations.scm index 8309f845d9..140c22b620 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -1207,13 +1207,25 @@ they can refer to each other." #:guile-for-build guile #:local-build? #t))) +(define %module-cache + ;; Map a list of modules to its 'imported+compiled-modules' result. + (make-weak-value-hash-table)) + (define* (imported+compiled-modules store modules #:key (system (%current-system)) (guile (%guile-for-build))) "Return a pair containing the derivation to import MODULES and that where MODULES are compiled." - (cons (%imported-modules store modules #:system system #:guile guile) - (%compiled-modules store modules #:system system #:guile guile))) + (define key + (list modules (derivation-file-name guile) system)) + + (or (hash-ref %module-cache key) + (let ((result (cons (%imported-modules store modules + #:system system #:guile guile) + (%compiled-modules store modules + #:system system #:guile guile)))) + (hash-set! %module-cache key result) + result))) (define* (build-expression->derivation store name exp ;deprecated #:key -- cgit v1.2.3 From f58b45350b0ebfc36a707d9e986f5fe904af3605 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 27 Oct 2019 18:55:44 +0100 Subject: gexp: Add 'imported+compiled-modules'. * guix/gexp.scm (imported+compiled-modules): New procedure. (lower-gexp): Use it instead of separate calls to 'imported-modules' and 'compiled-modules'. --- guix/gexp.scm | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index 7323277511..fa74e80cd6 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -654,6 +654,28 @@ names and file names suitable for the #:allowed-references argument to (load-path lowered-gexp-load-path) ;list of store items (load-compiled-path lowered-gexp-load-compiled-path)) ;list of store items +(define* (imported+compiled-modules modules system + #:key (extensions '()) + deprecation-warnings guile + (module-path %load-path)) + "Return a pair where the first element is the imported MODULES and the +second element is the derivation to compile them." + (mlet %store-monad ((modules (if (pair? modules) + (imported-modules modules + #:system system + #:module-path module-path) + (return #f))) + (compiled (if (pair? modules) + (compiled-modules modules + #:system system + #:module-path module-path + #:extensions extensions + #:guile guile + #:deprecation-warnings + deprecation-warnings) + (return #f)))) + (return (cons modules compiled)))) + (define* (lower-gexp exp #:key (module-path %load-path) @@ -719,20 +741,15 @@ derivations--e.g., code evaluated for its side effects." (lambda (obj) (lower-object obj system)) extensions)) - (modules (if (pair? %modules) - (imported-modules %modules - #:system system - #:module-path module-path) - (return #f))) - (compiled (if (pair? %modules) - (compiled-modules %modules - #:system system - #:module-path module-path - #:extensions extensions - #:guile guile - #:deprecation-warnings - deprecation-warnings) - (return #f)))) + (modules+compiled (imported+compiled-modules + %modules system + #:extensions extensions + #:deprecation-warnings + deprecation-warnings + #:guile guile + #:module-path module-path)) + (modules -> (car modules+compiled)) + (compiled -> (cdr modules+compiled))) (define load-path (search-path modules exts (string-append "/share/guile/site/" effective-version))) -- cgit v1.2.3 From c57e417eff8649fce44041bc8e187a3e0c91b801 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 27 Oct 2019 19:08:15 +0100 Subject: store: Allow objects in the cache to be inserted and search for with 'equal?'. * guix/store.scm (cache-object-mapping): Add #:vhash-cons parameter and honor it. (lookup-cached-object): Add #:vhash-fold* parameter and honor it. (%mcached): Add #:vhash-fold* and #:vhash-cons and honor them. (mcached): Add clauses with 'eq?' and 'equal?' as the first argument. --- guix/store.scm | 67 +++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 24 deletions(-) diff --git a/guix/store.scm b/guix/store.scm index 382aad29d9..a276554a52 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -1612,10 +1612,11 @@ This makes sense only when the daemon was started with '--cache-failures'." ;; from %STATE-MONAD. (template-directory instantiations %store-monad) -(define* (cache-object-mapping object keys result) +(define* (cache-object-mapping object keys result + #:key (vhash-cons vhash-consq)) "Augment the store's object cache with a mapping from OBJECT/KEYS to RESULT. KEYS is a list of additional keys to match against, for instance a (SYSTEM -TARGET) tuple. +TARGET) tuple. Use VHASH-CONS to insert OBJECT into the cache. OBJECT is typically a high-level object such as a or an , and RESULT is typically its derivation." @@ -1623,8 +1624,8 @@ and RESULT is typically its derivation." (values result (store-connection (inherit store) - (object-cache (vhash-consq object (cons result keys) - (store-connection-object-cache store))))))) + (object-cache (vhash-cons object (cons result keys) + (store-connection-object-cache store))))))) (define record-cache-lookup! (if (profiled? "object-cache") @@ -1653,11 +1654,12 @@ and RESULT is typically its derivation." (lambda (x y) #t))) -(define* (lookup-cached-object object #:optional (keys '())) +(define* (lookup-cached-object object #:optional (keys '()) + #:key (vhash-fold* vhash-foldq*)) "Return the cached object in the store connection corresponding to OBJECT -and KEYS. KEYS is a list of additional keys to match against, and which are -compared with 'equal?'. Return #f on failure and the cached result -otherwise." +and KEYS; use VHASH-FOLD* to look for OBJECT in the cache. KEYS is a list of +additional keys to match against, and which are compared with 'equal?'. +Return #f on failure and the cached result otherwise." (lambda (store) (let* ((cache (store-connection-object-cache store)) @@ -1665,33 +1667,50 @@ otherwise." ;; the whole vlist chain and significantly reduces the number of ;; 'hashq' calls. (value (let/ec return - (vhash-foldq* (lambda (item result) - (match item - ((value . keys*) - (if (equal? keys keys*) - (return value) - result)))) - #f object - cache)))) + (vhash-fold* (lambda (item result) + (match item + ((value . keys*) + (if (equal? keys keys*) + (return value) + result)))) + #f object + cache)))) (record-cache-lookup! value cache) (values value store)))) -(define* (%mcached mthunk object #:optional (keys '())) +(define* (%mcached mthunk object #:optional (keys '()) + #:key + (vhash-cons vhash-consq) + (vhash-fold* vhash-foldq*)) "Bind the monadic value returned by MTHUNK, which supposedly corresponds to -OBJECT/KEYS, or return its cached value." - (mlet %store-monad ((cached (lookup-cached-object object keys))) +OBJECT/KEYS, or return its cached value. Use VHASH-CONS to insert OBJECT into +the cache, and VHASH-FOLD* to look it up." + (mlet %store-monad ((cached (lookup-cached-object object keys + #:vhash-fold* vhash-fold*))) (if cached (return cached) (>>= (mthunk) (lambda (result) - (cache-object-mapping object keys result)))))) + (cache-object-mapping object keys result + #:vhash-cons vhash-cons)))))) -(define-syntax-rule (mcached mvalue object keys ...) - "Run MVALUE, which corresponds to OBJECT/KEYS, and cache it; or return the +(define-syntax mcached + (syntax-rules (eq? equal?) + "Run MVALUE, which corresponds to OBJECT/KEYS, and cache it; or return the value associated with OBJECT/KEYS in the store's object cache if there is one." - (%mcached (lambda () mvalue) - object (list keys ...))) + ((_ eq? mvalue object keys ...) + (%mcached (lambda () mvalue) + object (list keys ...) + #:vhash-cons vhash-consq + #:vhash-fold* vhash-foldq*)) + ((_ equal? mvalue object keys ...) + (%mcached (lambda () mvalue) + object (list keys ...) + #:vhash-cons vhash-cons + #:vhash-fold* vhash-fold*)) + ((_ mvalue object keys ...) + (mcached eq? mvalue object keys ...)))) (define (preserve-documentation original proc) "Return PROC with documentation taken from ORIGINAL." -- cgit v1.2.3 From f5fca9a82cec76d2e10b8b6c96be2dd79f638ba0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 27 Oct 2019 19:12:11 +0100 Subject: gexp: Cache the module to derivation mappings. This reduces the number of 'add-data-to-store' cache lookups from 3329 to 2743 (hit rate: 27% to 11%) when running: GUIX_PROFILING=add-data-to-store-cache guix build libreoffice -nd Execution time of "guix build libreoffice -nd" goes from 1.86s to 1.80s. * guix/gexp.scm (imported+compiled-modules): Wrap body in 'mcached'. --- guix/gexp.scm | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index fa74e80cd6..b640c079e4 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -660,21 +660,24 @@ names and file names suitable for the #:allowed-references argument to (module-path %load-path)) "Return a pair where the first element is the imported MODULES and the second element is the derivation to compile them." - (mlet %store-monad ((modules (if (pair? modules) - (imported-modules modules - #:system system - #:module-path module-path) - (return #f))) - (compiled (if (pair? modules) - (compiled-modules modules - #:system system - #:module-path module-path - #:extensions extensions - #:guile guile - #:deprecation-warnings - deprecation-warnings) - (return #f)))) - (return (cons modules compiled)))) + (mcached equal? + (mlet %store-monad ((modules (if (pair? modules) + (imported-modules modules + #:system system + #:module-path module-path) + (return #f))) + (compiled (if (pair? modules) + (compiled-modules modules + #:system system + #:module-path module-path + #:extensions extensions + #:guile guile + #:deprecation-warnings + deprecation-warnings) + (return #f)))) + (return (cons modules compiled))) + modules + system extensions guile deprecation-warnings module-path)) (define* (lower-gexp exp #:key -- cgit v1.2.3 From d727a9343d861cf775645df8be5bfefd43d6c6f0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 27 Oct 2019 19:19:14 +0100 Subject: derivations: Don't memoize 'derivation->bytevector'. Its hit rate was only 8%. Removing it reduces heap size of "guix build libreoffice -nd" from 69MiB to 61MiB and the wall-clock time is unchanged. * guix/derivations.scm (derivation->bytevector): Change from 'mlambda' to 'lambda'. --- guix/derivations.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/derivations.scm b/guix/derivations.scm index 140c22b620..706c650469 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -622,7 +622,7 @@ that form." (display ")" port)))) (define derivation->bytevector - (mlambda (drv) + (lambda (drv) "Return the external representation of DRV as a UTF-8-encoded string." (with-fluids ((%default-port-encoding "UTF-8")) (call-with-values open-bytevector-output-port -- cgit v1.2.3 From 5166d027308f4cf694f5cff1c0670b6ff622c226 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 27 Oct 2019 22:32:09 +0100 Subject: gnu: bootstrap: 'bootstrap-origin' preserves eq?-ness when no changes are made. This reduces the number of lookups in the 'add-data-to-store' cache from 2743 to 2705 (hit rate: 11% to 10%) when running GUIX_PROFILING=add-data-to-store-cache guix build libreoffice -nd The execution time of "guix build libreoffice -nd" goes from 1.80s to 1.78s. * gnu/packages/bootstrap.scm (bootstrap-origin): Return SOURCE unchanged when its has no patches and no snippet. --- gnu/packages/bootstrap.scm | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index ee713db0cf..363c99c7c3 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -167,19 +167,22 @@ for system '~a'") ("patch" ,%bootstrap-coreutils&co))) (let ((orig-method (origin-method source))) - (origin (inherit source) - (method (cond ((eq? orig-method url-fetch) - (boot url-fetch)) - (else orig-method))) - (patch-guile %bootstrap-guile) - (patch-inputs %bootstrap-patch-inputs) - - ;; Patches can be origins as well, so process them. - (patches (map (match-lambda - ((? origin? patch) - (bootstrap-origin patch)) - (patch patch)) - (origin-patches source)))))) + (if (or (not (null? (origin-patches source))) + (origin-snippet source)) + (origin (inherit source) + (method (if (eq? orig-method url-fetch) + (boot url-fetch) + orig-method)) + (patch-guile %bootstrap-guile) + (patch-inputs %bootstrap-patch-inputs) + + ;; Patches can be origins as well, so process them. + (patches (map (match-lambda + ((? origin? patch) + (bootstrap-origin patch)) + (patch patch)) + (origin-patches source)))) + source))) (define* (package-from-tarball name source program-to-test description #:key snippet) -- cgit v1.2.3 From ac19950507e941b6263f62f4ee4e8934c1b1598e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 27 Oct 2019 22:42:59 +0100 Subject: gnu: bootstrap: Cache the 'bootstrap-executable' origins. This reduces the number of lookups in the 'add-data-to-store' cache from 2705 to 2685 (hit rate: 10% to 9%) when running: GUIX_PROFILING=add-data-to-store-cache guix build libreoffice -nd * gnu/packages/bootstrap.scm (raw-build)[->store]: Use 'lower-object' instead of 'origin->derivation'. This allows the origin-to-derivation mapping to be cached. --- gnu/packages/bootstrap.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 363c99c7c3..c6e3c697e6 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -33,6 +33,7 @@ #:use-module ((guix derivations) #:select (derivation derivation-input derivation->output-path)) #:use-module ((guix utils) #:select (gnu-triplet->nix-system)) + #:use-module ((guix gexp) #:select (lower-object)) #:use-module (guix memoization) #:use-module (guix i18n) #:use-module (srfi srfi-1) @@ -348,8 +349,8 @@ or false to signal an error." #:allow-other-keys) (define (->store file) (run-with-store store - (origin->derivation (bootstrap-executable file system) - system))) + (lower-object (bootstrap-executable file system) + system))) (let* ((tar (->store "tar")) (xz (->store "xz")) -- cgit v1.2.3 From b74ed90916dce6239dbe6842548f82e22fc8c249 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 27 Oct 2019 23:00:39 +0100 Subject: channels: Refer to 'guile-json-3'. Fixes a regression introduced in 84af1e74029fd4c43636f7d8d3e6f82ddab9ce82. * guix/channels.scm (whole-package-for-legacy): Refer to GUILE-JSON-3, not GUILE-JSON. --- guix/channels.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/channels.scm b/guix/channels.scm index 2c28dccbcb..826ee729ad 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -505,7 +505,7 @@ modules in the old ~/.config/guix/latest style." ;; In the "old style", %SELF-BUILD-FILE would simply return a ;; derivation that builds modules. We have to infer what the ;; dependencies of these modules were. - (list guile-json guile-git guile-bytestructures + (list guile-json-3 guile-git guile-bytestructures (ssh -> guile-ssh) (tls -> gnutls))))) (define (old-style-guix? drv) -- cgit v1.2.3 From 49af34cfac89d384c46269bfd9388b2c73b1220a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 22 Oct 2019 18:05:51 +0200 Subject: pull: Honor '/etc/guix/channels.scm'. * guix/scripts/pull.scm (channel-list)[global-file]: New variable. [channels]: Honor it. * doc/guix.texi (Invoking guix pull): Document it. --- doc/guix.texi | 18 +++++++++++++++++- guix/scripts/pull.scm | 5 +++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index a934626e5a..7cc33c6e22 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -3666,6 +3666,21 @@ descriptions, and deploys it. Source code is downloaded from a @uref{https://git-scm.com, Git} repository, by default the official GNU@tie{}Guix repository, though this can be customized. +Specifically, @command{guix pull} downloads code from the @dfn{channels} +(@pxref{Channels}) specified by one of the followings, in this order: + +@enumerate +@item +the @option{--channels} option; +@item +the user's @file{~/.config/guix/channels.scm} file; +@item +the system-wide @file{/etc/guix/channels.scm} file; +@item +the built-in default channels specified in the @code{%default-channels} +variable. +@end enumerate + On completion, @command{guix package} will use packages and package versions from this just-retrieved copy of Guix. Not only that, but all the Guix commands and Scheme modules will also be taken from that latest @@ -3763,7 +3778,8 @@ configuration in the @file{~/.config/guix/channels.scm} file or using the @item --channels=@var{file} @itemx -C @var{file} Read the list of channels from @var{file} instead of -@file{~/.config/guix/channels.scm}. @var{file} must contain Scheme code that +@file{~/.config/guix/channels.scm} or @file{/etc/guix/channels.scm}. +@var{file} must contain Scheme code that evaluates to a list of channel objects. @xref{Channels}, for more information. diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 7876019eac..80d070652b 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -714,6 +714,9 @@ transformations specified in OPTS (resulting from '--url', '--commit', or (define default-file (string-append (config-directory) "/channels.scm")) + (define global-file + (string-append %sysconfdir "/guix/channels.scm")) + (define (load-channels file) (let ((result (load* file (make-user-module '((guix channels)))))) (if (and (list? result) (every channel? result)) @@ -725,6 +728,8 @@ transformations specified in OPTS (resulting from '--url', '--commit', or (load-channels file)) ((file-exists? default-file) (load-channels default-file)) + ((file-exists? global-file) + (load-channels global-file)) (else %default-channels))) -- cgit v1.2.3 From b13b9384bc43bf93c754c037956c8ef9a99c2b41 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 27 Oct 2019 23:11:39 +0100 Subject: news: Add entry for /etc/guix/channels.scm. * etc/news.scm: Add entry to /etc/guix/channels.scm. --- etc/news.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/etc/news.scm b/etc/news.scm index 80f7ba522c..8f79848b7f 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -9,6 +9,22 @@ (channel-news (version 0) + (entry (commit "49af34cfac89d384c46269bfd9388b2c73b1220a") + (title (en "@command{guix pull} now honors +@file{/etc/guix/channels.scm") + (fr "@command{guix pull} lit maintenant +@file{/etc/guix/channels.scm}")) + (body + (en "The @command{guix pull} command will now read the +@file{/etc/guix/channels.scm} file if it exists and if the per-user +@file{~/.config/guix/channels.scm} is not present. This allows administrators +of multi-user systems to define site-wide defaults.") + (fr "La commande @command{guix pull} lira maintenant le fichier +@file{/etc/guix/channels.scm} s'il existe et si le fichier +@file{~/.config/guix/channels.scm} par utilisateur·rice n'est pas présent. +Cela permet aux personnes administrant des systèmes multi-utilisateurs de +définir les canaux par défaut."))) + (entry (commit "81c580c8664bfeeb767e2c47ea343004e88223c7") (title (en "Insecure @file{/var/guix/profiles/per-user} permissions (CVE-2019-18192)") (de "Sicherheitslücke in @file{/var/guix/profiles/per-user}-Berechtigungen (CVE-2019-18192)") -- cgit v1.2.3 From da42873c18de50f8b3a66dbefd068bb0393667cc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 27 Oct 2019 23:13:22 +0100 Subject: gnu: telepathy-mission-control: Don't use NAME in source URI. * gnu/packages/freedesktop.scm (telepathy-mission-control)[source]: Hard-code NAME. --- gnu/packages/freedesktop.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index cb308b77f4..96aab0464b 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1102,13 +1102,14 @@ messaging clients such as Empathy, GNOME Shell or KDE Telepathy.") (package (name "telepathy-mission-control") (version "5.16.4") - (source (origin - (method url-fetch) - (uri (string-append "https://telepathy.freedesktop.org/releases/" - name "/" name "-" version ".tar.gz")) - (sha256 - (base32 - "1jz6wwgsfxixha6ys2hbzbk5faqnj9kh2m5qdlgx5anqgandsscp")))) + (source + (origin + (method url-fetch) + (uri (string-append "https://telepathy.freedesktop.org/releases/" + "telepathy-mission-control/" + "telepathy-mission-control-" version ".tar.gz")) + (sha256 + (base32 "1jz6wwgsfxixha6ys2hbzbk5faqnj9kh2m5qdlgx5anqgandsscp")))) (build-system gnu-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. -- cgit v1.2.3 From 6c5401fca8d5b491367f700082b79fb8090ec294 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 27 Oct 2019 23:14:49 +0100 Subject: gnu: telepathy-mission-control: Update to 5.16.5. * gnu/packages/freedesktop.scm (telepathy-mission-control): Update to 5.16.5. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 96aab0464b..b18d71cb98 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1101,7 +1101,7 @@ messaging clients such as Empathy, GNOME Shell or KDE Telepathy.") (define-public telepathy-mission-control (package (name "telepathy-mission-control") - (version "5.16.4") + (version "5.16.5") (source (origin (method url-fetch) @@ -1109,7 +1109,7 @@ messaging clients such as Empathy, GNOME Shell or KDE Telepathy.") "telepathy-mission-control/" "telepathy-mission-control-" version ".tar.gz")) (sha256 - (base32 "1jz6wwgsfxixha6ys2hbzbk5faqnj9kh2m5qdlgx5anqgandsscp")))) + (base32 "00xxv38cfdirnfvgyd56m60j0nkmsv5fz6p2ydyzsychicxl6ssc")))) (build-system gnu-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. -- cgit v1.2.3 From 271b3c9d16f8880f4a27b52a615cdec611322fae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 27 Oct 2019 23:45:29 +0100 Subject: gnu: fetchmail: Update to 6.4.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mail.scm (fetchmail): Update to 6.4.1. [source]: Parameterize URI. [arguments]: Add ‘create-test-environment’ phase. --- gnu/packages/mail.scm | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 2c6192ca01..dc7f6c591e 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -320,20 +320,29 @@ to run without any changes.") (define-public fetchmail (package (name "fetchmail") - (version "6.3.26") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/fetchmail/branch_6.3/fetchmail-" - version ".tar.xz")) - (sha256 - (base32 - "0l78ayvi9dm8hd190gl139cs2xqsrf7r9ncilslw20mgvd6cbd3r")))) + (version "6.4.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/fetchmail/branch_" + (version-major+minor version) "/" + "fetchmail-" version ".tar.xz")) + (sha256 + (base32 "1859wvfc9fq72mwp4njdiy0x89hnddlfr3nix71qqglcs0fz2crz")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl))) (arguments - `(#:configure-flags (list (string-append "--with-ssl=" - (assoc-ref %build-inputs "openssl"))))) + `(#:configure-flags + (list (string-append "--with-ssl=" + (assoc-ref %build-inputs "openssl"))) + #:phases + (modify-phases %standard-phases + (add-before 'check 'create-test-environment + (lambda _ + ;; Fix ‘Cannot find absolute path for user's home directory’. + (setenv "HOME" "/tmp") + #t))))) (home-page "http://www.fetchmail.info/") (synopsis "Remote-mail retrieval and forwarding utility") (description -- cgit v1.2.3 From 447b61d4cfb2a2de39221777590233eeae3aed12 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 27 Oct 2019 23:52:25 +0100 Subject: gnu: fetchmail: Use HTTPS home page. * gnu/packages/mail.scm (fetchmail)[home-page]: Use HTTPS. --- gnu/packages/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index dc7f6c591e..f753e3756f 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -343,7 +343,7 @@ to run without any changes.") ;; Fix ‘Cannot find absolute path for user's home directory’. (setenv "HOME" "/tmp") #t))))) - (home-page "http://www.fetchmail.info/") + (home-page "https://www.fetchmail.info/") (synopsis "Remote-mail retrieval and forwarding utility") (description "Fetchmail is a full-featured, robust, well-documented remote-mail -- cgit v1.2.3 From 1219a7cc0521e4916287acd265e50b0af2bfb336 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 27 Oct 2019 23:58:01 +0100 Subject: gnu: bitcoin-core: Update to 0.18.1. * gnu/packages/finance.scm (bitcoin-core): Update to 0.18.1. --- gnu/packages/finance.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 960e3adeb3..bbd1aa947c 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -86,7 +86,7 @@ (define-public bitcoin-core (package (name "bitcoin-core") - (version "0.18.0") + (version "0.18.1") (source (origin (method url-fetch) (uri @@ -94,15 +94,15 @@ version "/bitcoin-" version ".tar.gz")) (sha256 (base32 - "0ps0vw9iknz1b1sx74rabd1yhlxvwbd0aimjzn9hlqkvw286hkjy")))) + "15mz0gmm058gmq2gdpffbw25jpv7mksyhyfws6i7mqvrapqr6zaw")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("python" ,python) ; for the tests - ("util-linux" ,util-linux) ; provides the hexdump command for tests + ("python" ,python) ; for the tests + ("util-linux" ,util-linux) ; provides the hexdump command for tests ("qttools" ,qttools))) (inputs - `(("bdb" ,bdb-4.8) ; Bitcoin Core requires bdb 4.8 for compatibility + `(("bdb" ,bdb-4.8) ; 4.8 required for compatibility ("boost" ,boost) ("libevent" ,libevent) ("miniupnpc" ,miniupnpc) @@ -133,7 +133,7 @@ #t)) (add-before 'check 'set-home (lambda _ - (setenv "HOME" (getenv "TMPDIR")) ; Tests write to $HOME. + (setenv "HOME" (getenv "TMPDIR")) ; tests write to $HOME #t)) (add-after 'check 'check-functional (lambda _ -- cgit v1.2.3 From ee51577325525fcecc2828da94e9001b3c5d7636 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 28 Oct 2019 00:08:32 +0100 Subject: gnu: python-ipython: Update to 7.9.0. * gnu/packages/python-xyz.scm (python-ipython): Update to 7.9.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8ad5c92239..476ac2f588 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5624,13 +5624,13 @@ computing.") (define-public python-ipython (package (name "python-ipython") - (version "7.5.0") + (version "7.9.0") (source (origin (method url-fetch) (uri (pypi-uri "ipython" version ".tar.gz")) (sha256 - (base32 "09mbxq37mfn88xjnib7qfzaq9krr7gf1jxwy1p6mcjr254082h78")))) + (base32 "103jkw18z7fnwdal1mdbijjxi1fndzn31g887lmj7ddpf2r07lyz")))) (build-system python-build-system) (propagated-inputs `(("python-backcall" ,python-backcall) -- cgit v1.2.3 From 3cbf3f74597b3c200b24ed47833747a2743675c6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 28 Oct 2019 00:10:46 +0100 Subject: gnu: ghc-xmonad-contrib: Update to 0.16. * gnu/packages/wm.scm (ghc-xmonad-contrib): Update to 0.16. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 7c573337d4..e793d89bfa 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -691,14 +691,14 @@ Haskell, no knowledge of the language is required to install and use it.") (define-public ghc-xmonad-contrib (package (name "ghc-xmonad-contrib") - (version "0.15") + (version "0.16") (source (origin (method url-fetch) (uri (string-append "mirror://hackage/package/xmonad-contrib/" "xmonad-contrib-" version ".tar.gz")) (sha256 - (base32 "0r9yzgy67j4mi3dyxx714f0ssk5qzca5kh4zw0fhiz1pf008cxms")))) + (base32 "1pddgkvnbww28wykncc7j0yb0lv15bk7xnnhdcbrwkxzw66w6wmd")))) (build-system haskell-build-system) (propagated-inputs `(("ghc-old-time" ,ghc-old-time) -- cgit v1.2.3 From ea46f9c97c6b7d0a6a8a78f8dcb16997c620bce9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 28 Oct 2019 00:14:26 +0100 Subject: gnu: btrfs-progs: Update to 5.3.1. * gnu/packages/linux.scm (btrfs-progs): Update to 5.3.1. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 32eaef244e..8bfa9ce258 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3901,7 +3901,7 @@ and copy/paste text in the console and in xterm.") (define-public btrfs-progs (package (name "btrfs-progs") - (version "5.3") + (version "5.3.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/kernel/" @@ -3909,7 +3909,7 @@ and copy/paste text in the console and in xterm.") "btrfs-progs-v" version ".tar.xz")) (sha256 (base32 - "13ivb1b627qkiiqxh2y7zawynarkmgxrnwwpqhx6cci621yyqqqp")))) + "0f6s1iwiqbncrvxp74k50s88x6zqf85sjxg04kyni82l1vk1m8xz")))) (build-system gnu-build-system) (outputs '("out" "static")) ; static versions of the binaries in "out" -- cgit v1.2.3 From 85f8fb75ee2e4c7ed7da3281618b32c0ba272699 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 28 Oct 2019 00:45:04 +0100 Subject: gnu: wireshark: Update to 3.0.6. * gnu/packages/networking.scm (wireshark): Update to 3.0.6. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index d9134ff910..9173871497 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -595,14 +595,14 @@ of the same name.") (define-public wireshark (package (name "wireshark") - (version "3.0.5") + (version "3.0.6") (source (origin (method url-fetch) (uri (string-append "https://www.wireshark.org/download/src/wireshark-" version ".tar.xz")) (sha256 - (base32 "087qv7nd7zlbckvcs37fkkg7v0mw0hjd5yfbghqym764fpjgqlf5")))) + (base32 "0gp3qg0280ysrsaa97yfazka8xcyrspsrw8bfgqxnpf1l0i40zx8")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit v1.2.3 From e30808ddb33f4aa0c4940ce8596ddc71ff55ed2a Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 28 Oct 2019 09:36:32 +0100 Subject: gnu: weasyprint: Add note to patch. * gnu/packages/patches/weasyprint-library-paths.patch: Add note. --- gnu/packages/patches/weasyprint-library-paths.patch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/patches/weasyprint-library-paths.patch b/gnu/packages/patches/weasyprint-library-paths.patch index eabbdbdcd6..317f0c542e 100644 --- a/gnu/packages/patches/weasyprint-library-paths.patch +++ b/gnu/packages/patches/weasyprint-library-paths.patch @@ -1,3 +1,8 @@ +Make weasyprint load dynamic libraries from hard-coded path. + +From NixOS +pkgs/development/python-modules/weasyprint/library-paths.patch + diff --git a/weasyprint/fonts.py b/weasyprint/fonts.py index 377716c1..2016e01c 100644 --- a/weasyprint/fonts.py -- cgit v1.2.3 From f6c27c554138279f5d41e5db0e73fdcdb4d51e85 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 28 Oct 2019 09:56:09 +0100 Subject: doc: Fix some typos in "Guix Profiles in Practice". * doc/guix-cookbook.texi (Guix Profiles in Practice): Fix typos. --- doc/guix-cookbook.texi | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index 1b081a820e..6026f589a8 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -801,7 +801,7 @@ reference. Guix provides a very useful feature that may be quite foreign to newcomers: @emph{profiles}. They are a way to group package installations together and all users -on a same system are free to use as many profiles as they want. +on the same system are free to use as many profiles as they want. Whether you're a developer or not, you may find that multiple profiles bring you great power and flexibility. While they shift the paradigm somewhat compared to @@ -830,7 +830,7 @@ shells, each of them running different profiles. @item Isolation: Programs from one profile will not use programs from the other, and -they user can even install different versions of the same programs to the two +the user can even install different versions of the same programs to the two profiles without conflict. @item @@ -840,8 +840,10 @@ This makes multiple profiles storage-efficient. @item Reproducible: when used with declarative manifests, a profile can be fully specified by the Guix commit that was active when it was set up. This means -that the exact same profile can be @uref{https://guix.gnu.org/blog/2018/multi-dimensional-transactions-and-rollbacks-oh-my/, set up anywhere, anytime}, with just the -commit information. See the section on @ref{Reproducible profiles}. +that the exact same profile can be +@uref{https://guix.gnu.org/blog/2018/multi-dimensional-transactions-and-rollbacks-oh-my/, +set up anywhere and anytime}, with just the commit information. See the +section on @ref{Reproducible profiles}. @item Easier upgrades and maintenance: Multiple profiles make it easy to keep @@ -1012,7 +1014,7 @@ the profile is loaded, you've got two options: @item Either export the variable manually, e.g. @example -export MANPATH=/path/to/profile$@{MANPATH:+:@}$MANPATH" +export MANPATH=/path/to/profile$@{MANPATH:+:@}$MANPATH @end example @item -- cgit v1.2.3 From ffe059afb5bdbc4ab099d9fb60bde1c511d752cb Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 28 Oct 2019 10:29:55 +0100 Subject: doc: Finish importing the "Packaging Tutorial". * doc/guix-cookbook.texi (Packaging Tutorial): Import all sections after the Scheme crash course. --- doc/guix-cookbook.texi | 780 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 779 insertions(+), 1 deletion(-) diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index 6026f589a8..04eb5498ec 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -331,6 +331,7 @@ It does not assume much knowledge of the Guix system nor of the Lisp language. The reader is only expected to be familiar with the command line and to have some basic programming knowledge. +@node A "Hello World" package @subsection A "Hello World" package The “Defining Packages” section of the manual introduces the basics of Guix @@ -521,8 +522,785 @@ We've gone as far as we could without any knowledge of Scheme. Before moving on to more complex packages, now is the right time to brush up on your Scheme knowledge. @pxref{A Scheme Crash Course} to get up to speed. -@c TODO: Continue the tutorial +@node Setup +@subsection Setup +In the rest of this chapter we will rely on some basic Scheme +programming knowledge. Now let's detail the different possible setups +for working on Guix packages. + +There are several ways to set up a Guix packaging environment. + +We recommend you work directly on the Guix source checkout since it makes it +easier for everyone to contribute to the project. + +But first, let's look at other possibilities. + +@node Local file +@subsubsection Local file + +This is what we previously did with @samp{my-hello}. With the Scheme basics we've +covered, we are now able to explain the leading chunks. As stated in @code{guix +package --help}: + +@example + -f, --install-from-file=FILE + install the package that the code within FILE + evaluates to +@end example + +Thus the last expression @emph{must} return a package, which is the case in our +earlier example. + +The @code{use-modules} expression tells which of the modules we need in the file. +Modules are a collection of values and procedures. They are commonly called +"libraries" or "packages" in other programming languages. + +@node @samp{GUIX_PACKAGE_PATH} +@subsubsection @samp{GUIX_PACKAGE_PATH} + +@emph{Note: Starting from Guix 0.16, the more flexible Guix "channels" are the +preferred way and supersede @samp{GUIX_PACKAGE_PATH}. See next section.} + +It can be tedious to specify the file from the command line instead of simply +calling @code{guix package --install my-hello} as you would do with the official +packages. + +Guix makes it possible to streamline the process by adding as many "package +declaration paths" as you want. + +Create a directory, say @samp{~./guix-packages} and add it to the @samp{GUIX_PACKAGE_PATH} +environment variable: + +@example +$ mkdir ~/guix-packages +$ export GUIX_PACKAGE_PATH=~/guix-packages +@end example + +To add several directories, separate them with a colon (@code{:}). + +Our previous @samp{my-hello} needs some adjustments though: + +@example +(define-module (my-hello) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix build-system gnu) + #:use-module (guix download)) + +(define-public my-hello + (package + (name "my-hello") + (version "2.10") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/hello/hello-" version + ".tar.gz")) + (sha256 + (base32 + "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i")))) + (build-system gnu-build-system) + (synopsis "Hello, Guix world: An example custom Guix package") + (description + "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 "https://www.gnu.org/software/hello/") + (license gpl3+))) +@end example + +Note that we have assigned the package value to an exported variable name with +@code{define-public}. This is effectively assigning the package to the @code{my-hello} +variable so that it can be referenced, among other as dependency of other +packages. + +If you use @code{guix package --install-from-file=my-hello.scm} on the above file, it +will fail because the last expression, @code{define-public}, does not return a +package. If you want to use @code{define-public} in this use-case nonetheless, make +sure the file ends with an evaluation of @code{my-hello}: + +@example +; ... +(define-public my-hello + ; ... + ) + +my-hello +@end example + +This last example is not very typical. + +Now @samp{my-hello} should be part of the package collection like all other official +packages. You can verify this with: + +@example +$ guix package --show=my-hello +@end example + +@node Guix channels +@subsubsection Guix channels + +Guix 0.16 features channels, which is very similar to @samp{GUIX_PACKAGE_PATH} but +provides better integration and provenance tracking. Channels are not +necessarily local, they can be maintained as a public Git repository for +instance. Of course, several channels can be used at the same time. + +@xref{Channels,,, guix, GNU Guix Reference Manual} for setup details. + +@node Direct checkout hacking +@subsubsection Direct checkout hacking + +Working directly on the Guix project is recommended: it reduces the friction +when the time comes to submit your changes upstream to let the community benefit +from your hard work! + +Unlike most software distributions, the Guix repository holds in one place both +the tooling (including the package manager) and the package definitions. This +choice was made so that it would give developers the flexibility to modify the +API without breakage by updating all packages at the same time. This reduces +development inertia. + +Check out the official @uref{https://git-scm.com/, Git} repository: + +@example +$ git clone https://git.savannah.gnu.org/git/guix.git +@end example + +In the rest of this article, we use @samp{$GUIX_CHECKOUT} to refer to the location of +the checkout. + + +Follow the instruction in the manual (@pxref{Contributing,,, guix, GNU Guix +Reference Manual}) to set up the repository environment. + +Once ready, you should be able to use the package definitions from the +repository environment. + +Feel free to edit package definitions found in @samp{$GUIX_CHECKOUT/gnu/packages}. + +The @samp{$GUIX_CHECKOUT/pre-inst-env} script lets you use @samp{guix} over the package +collection of the repository. + +@itemize +@item +Search packages, such as Ruby: + +@example + $ cd $GUIX_CHECKOUT + $ ./pre-inst-env guix package --list-available=ruby + ruby 1.8.7-p374 out gnu/packages/ruby.scm:119:2 + ruby 2.1.6 out gnu/packages/ruby.scm:91:2 + ruby 2.2.2 out gnu/packages/ruby.scm:39:2 +@end example + +@item +Build a package, here Ruby version 2.1: + +@example + $ ./pre-inst-env guix build --keep-failed ruby@@2.1 + /gnu/store/c13v73jxmj2nir2xjqaz5259zywsa9zi-ruby-2.1.6 +@end example + +@item +Install it to your user profile: + +@example + $ ./pre-inst-env guix package --install ruby@@2.1 +@end example + +@item +Check for common mistakes: + +@example + $ ./pre-inst-env guix lint ruby@@2.1 +@end example +@end itemize + +Guix strives at maintaining a high packaging standard; when contributing to the +Guix project, remember to + +@itemize +@item +follow the coding style (@pxref{Coding Style,,, guix, GNU Guix Reference Manual}), +@item +and review the check list from the manual (@pxref{Submitting Patches,,, guix, GNU Guix Reference Manual}). +@end itemize + +Once you are happy with the result, you are welcome to send your contribution to +make it part of Guix. This process is also detailed in the manual. (@pxref{Contributing,,, guix, GNU Guix Reference Manual}) + + +It's a community effort so the more join in, the better Guix becomes! + +@node Extended example +@subsection Extended example + +The above "Hello World" example is as simple as it goes. Packages can be more +complex than that and Guix can handle more advanced scenarios. Let's look at +another, more sophisticated package (slightly modified from the source): + +@example +(define-module (gnu packages version-control) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix utils) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (guix build-system cmake) + #:use-module (gnu packages ssh) + #:use-module (gnu packages web) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages compression) + #:use-module (gnu packages tls)) + +(define-public my-libgit2 + (let ((commit "e98d0a37c93574d2c6107bf7f31140b548c6a7bf") + (revision "1")) + (package + (name "my-libgit2") + (version (git-version "0.26.6" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libgit2/libgit2/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17pjvprmdrx4h6bb1hhc98w9qi6ki7yl57f090n9kbhswxqfs7s3")) + (patches (search-patches "libgit2-mtime-0.patch")) + (modules '((guix build utils))) + (snippet '(begin + ;; Remove bundled software. + (delete-file-recursively "deps") + #t)))) + (build-system cmake-build-system) + (outputs '("out" "debug")) + (arguments + `(#:tests? #t ; Run the test suite (this is the default) + #:configure-flags '("-DUSE_SHA1DC=ON") ; SHA-1 collision detection + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-hardcoded-paths + (lambda _ + (substitute* "tests/repo/init.c" + (("#!/bin/sh") (string-append "#!" (which "sh")))) + (substitute* "tests/clar/fs.h" + (("/bin/cp") (which "cp")) + (("/bin/rm") (which "rm"))) + #t)) + ;; Run checks more verbosely. + (replace 'check + (lambda _ (invoke "./libgit2_clar" "-v" "-Q"))) + (add-after 'unpack 'make-files-writable-for-tests + (lambda _ (for-each make-file-writable (find-files "." ".*"))))))) + (inputs + `(("libssh2" ,libssh2) + ("http-parser" ,http-parser) + ("python" ,python-wrapper))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (propagated-inputs + ;; These two libraries are in 'Requires.private' in libgit2.pc. + `(("openssl" ,openssl) + ("zlib" ,zlib))) + (home-page "https://libgit2.github.com/") + (synopsis "Library providing Git core methods") + (description + "Libgit2 is a portable, pure C implementation of the Git core methods +provided as a re-entrant linkable library with a solid API, allowing you to +write native speed custom Git applications in any language with bindings.") + ;; GPLv2 with linking exception + (license license:gpl2)))) +@end example + +(In those cases were you only want to tweak a few fields from a package +definition, you should rely on inheritance instead of copy-pasting everything. +See below.) + +Let's discuss those fields in depth. + +@subsubsection @code{git-fetch} method + +Unlike the @code{url-fetch} method, @code{git-fetch} expects a @code{git-reference} which takes +a Git repository and a commit. The commit can be any Git reference such as +tags, so if the @code{version} is tagged, then it can be used directly. Sometimes +the tag is prefixed with a @code{v}, in which case you'd use @code{(commit (string-append +"v" version))}. + +To ensure that the source code from the Git repository is stored in a unique +directory with a readable name we use @code{(file-name (git-file-name name +version))}. + +Note that there is also a @code{git-version} procedure that can be used to derive the +version when packaging programs for a specific commit. + +@subsubsection Snippets + +Snippets are quoted (i.e. non-evaluated) Scheme code that are a means of patching +the source. They are a Guix-y alternative to the traditional @samp{.patch} files. +Because of the quote, the code in only evaluated when passed to the Guix daemon +for building. + +There can be as many snippet as needed. + +Snippets might need additional Guile modules which can be imported from the +@code{modules} field. + +@subsubsection Inputs + +First, a syntactic comment: See the quasi-quote / comma syntax? + +@example + (native-inputs + `(("pkg-config" ,pkg-config))) +@end example + +is equivalent to + +@example + (native-inputs + (list (list "pkg-config" pkg-config))) +@end example + +You'll mostly see the former because it's shorter. + +There are 3 different input types. In short: + +@table @asis +@item native-inputs +Required for building but not runtime -- installing a package +through a substitute won't install these inputs. +@item inputs +Installed in the store but not in the profile, as well as being +present at build time. +@item propagated-inputs +Installed in the store and in the profile, as well as +being present at build time. +@end table + +@xref{Package Reference,,, guix, GNU Guix Reference Manual} for more details. + +The distinction between the various inputs is important: if a dependency can be +handled as an @emph{input} instead of a @emph{propagated input}, it should be done so, or +else it "pollutes" the user profile for no good reason. + +For instance, a user installing a graphical program that depends on a +command line tool might only be interested in the graphical part, so there is no +need to force the command line tool into the user profile. The dependency is a +concern to the package, not to the user. @emph{Inputs} make it possible to handle +dependencies without bugging the user by adding undesired executable files (or +libraries) to their profile. + +Same goes for @emph{native-inputs}: once the program is installed, build-time +dependencies can be safely garbage-collected. +It also matters when a substitute is available, in which case only the @emph{inputs} +and @emph{propagated inputs} will be fetched: the @emph{native inputs} are not required to +install a package from a substitute. + +@subsubsection Outputs + +Just like how a package can have multiple inputs, it can also produce multiple +outputs. + +Each output corresponds to a separate directory in the store. + +The user can choose which output to install; this is useful to save space or +to avoid polluting the user profile with unwanted executables or libraries. + +Output separation is optional. When the @code{outputs} field is left out, the +default and only output (the complete package) is referred to as @code{"out"}. + +Typical separate output names include @code{debug} and @code{doc}. + +It's advised to separate outputs only when you've shown it's worth it: if the +output size is significant (compare with @code{guix size}) or in case the package is +modular. + +@subsubsection Build system arguments + +The @code{arguments} is a keyword-value list used to configure the build process. + +The simplest argument @code{#:tests?} can be used to disable the test suite when +building the package. This is mostly useful when the package does not feature +any test suite. It's strongly recommended to keep the test suite on if there is +one. + +Another common argument is @code{:make-flags}, which specifies a list of flags to +append when running make, as you would from the command line. For instance, the +following flags + +@example +#:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")) + "CC=gcc") +@end example + +translate into + +@example +$ make CC=gcc prefix=/gnu/store/...- +@end example + +This sets the C compiler to @code{gcc} and the @code{prefix} variable (the installation +directory in Make parlance) to @code{(assoc-ref %outputs "out")}, which is a build-stage +global variable pointing to the destination directory in the store (something like +@samp{/gnu/store/...-my-libgit2-20180408}). + +Similarly, it's possible to set the "configure" flags. + +@example +#:configure-flags '("-DUSE_SHA1DC=ON") +@end example + +The @code{%build-inputs} variable is also generated in scope. It's an association +table that maps the input names to their store directories. + +The @code{phases} keyword lists the sequential steps of the build system. Typically +phases include @code{unpack}, @code{configure}, @code{build}, @code{install} and @code{check}. To know +more about those phases, you need to work out the appropriate build system +definition in @samp{$GUIX_CHECKOUT/guix/build/gnu-build-system.scm}: + +@example +(define %standard-phases + ;; Standard build phases, as a list of symbol/procedure pairs. + (let-syntax ((phases (syntax-rules () + ((_ p ...) `((p . ,p) ...))))) + (phases set-SOURCE-DATE-EPOCH set-paths install-locale unpack + bootstrap + patch-usr-bin-file + patch-source-shebangs configure patch-generated-file-shebangs + build check install + patch-shebangs strip + validate-runpath + validate-documentation-location + delete-info-dir-file + patch-dot-desktop-files + install-license-files + reset-gzip-timestamps + compress-documentation))) +@end example + +Or from the REPL: + +@example +> (add-to-load-path "/path/to/guix/checkout") +> ,module (guix build gnu-build-system) +> (map first %standard-phases) +(set-SOURCE-DATE-EPOCH set-paths install-locale unpack bootstrap patch-usr-bin-file patch-source-shebangs configure patch-generated-file-shebangs build check install patch-shebangs strip validate-runpath validate-documentation-location delete-info-dir-file patch-dot-desktop-files install-license-files reset-gzip-timestamps compress-documentation) +@end example + +If you want to know more about what happens during those phases, consult the +associated procedures. + +For instance, as of this writing the definition of @code{unpack} for the GNU build +system is + +@example +(define* (unpack #:key source #:allow-other-keys) + "Unpack SOURCE in the working directory, and change directory within the +source. When SOURCE is a directory, copy it in a sub-directory of the current +working directory." + (if (file-is-directory? source) + (begin + (mkdir "source") + (chdir "source") + + ;; Preserve timestamps (set to the Epoch) on the copied tree so that + ;; things work deterministically. + (copy-recursively source "." + #:keep-mtime? #t)) + (begin + (if (string-suffix? ".zip" source) + (invoke "unzip" source) + (invoke "tar" "xvf" source)) + (chdir (first-subdirectory ".")))) + #t) +@end example + +Note the @code{chdir} call: it changes the working directory to where the source was +unpacked. +Thus every phase following the @code{unpack} will use the source as a working +directory, which is why we can directly work on the source files. +That is to say, unless a later phase changes the working directory to something +else. + +We modify the list of @code{%standard-phases} of the build system with the +@code{modify-phases} macro as per the list of specified modifications, which may have +the following forms: + +@itemize +@item +@code{(add-before PHASE NEW-PHASE PROCEDURE)}: Run @code{PROCEDURE} named @code{NEW-PHASE} before @code{PHASE}. +@item +@code{(add-after PHASE NEW-PHASE PROCEDURE)}: Same, but afterwards. +@item +@code{(replace PHASE PROCEDURE)}. +@item +@code{(delete PHASE)}. +@end itemize + +The @code{PROCEDURE} supports the keyword arguments @code{inputs} and @code{outputs}. Each +input (whether @emph{native}, @emph{propagated} or not) and output directory is referenced +by their name in those variables. Thus @code{(assoc-ref outputs "out")} is the store +directory of the main output of the package. A phase procedure may look like +this: + +@example +(lambda* (#:key inputs outputs #:allow-other-keys) + (let (((bash-directory (assoc-ref inputs "bash")) + (output-directory (assoc-ref outputs "out")) + (doc-directory (assoc-ref outputs "doc")) + ; ... + #t) +@end example + +The procedure must return @code{#t} on success. It's brittle to rely on the return +value of the last expression used to tweak the phase because there is no +guarantee it would be a @code{#t}. Hence the trailing @code{#t} to ensure the right value +is returned on success. + +@subsubsection Code staging + +The astute reader may have noticed the quasi-quote and comma syntax in the +argument field. Indeed, the build code in the package declaration should not be +evaluated on the client side, but only when passed to the Guix daemon. This +mechanism of passing code around two running processes is called @uref{https://arxiv.org/abs/1709.00833, code staging}. + +@subsubsection "Utils" functions + +When customizing @code{phases}, we often need to write code that mimics the +equivalent system invocations (@code{make}, @code{mkdir}, @code{cp}, etc.) commonly used during +regular "Unix-style" installations. + +Some like @code{chmod} are native to Guile. +@xref{,,, guile, Guile reference manual} for a complete list. + +Guix provides additional helper functions which prove especially handy in the +context of package management. + +Some of those functions can be found in +@samp{$GUIX_CHECKOUT/guix/guix/build/utils.scm}. Most of them mirror the behaviour +of the traditional Unix system commands: + +@table @asis +@item which +Like the @samp{which} system command. +@item find-files +Akin to the @samp{find} system command. +@item mkdir-p +Like @samp{mkdir -p}, which creates all parents as needed. +@item install-file +Similar to @samp{install} when installing a file to a (possibly +non-existing) directory. Guile has @code{copy-file} which works +like @samp{cp}. +@item copy-recursively +Like @samp{cp -r}. +@item delete-file-recursively +Like @samp{rm -rf}. +@item invoke +Run an executable. This should be used instead of @code{system*}. +@item with-directory-excursion +Run the body in a different working directory, +then restore the previous working directory. +@item substitute* +A "sed-like" function. +@end table + +@subsubsection Module prefix + +The license in our last example needs a prefix: this is because of how the +@code{license} module was imported in the package, as @code{#:use-module ((guix licenses) +#:prefix license:)}. The Guile module import mechanism +(@pxref{Using Guile Modules,,, guile, Guile reference manual}) +gives the user full control over namespacing: this is needed to avoid +clashes between, say, the +@samp{zlib} variable from @samp{licenses.scm} (a @emph{license} value) and the @samp{zlib} variable +from @samp{compression.scm} (a @emph{package} value). + +@node Other build systems +@subsection Other build systems + +What we've seen so far covers the majority of packages using a build system +other than the @code{trivial-build-system}. The latter does not automate anything +and leaves you to build everything manually. This can be more demanding and we +won't cover it here for now, but thankfully it is rarely necessary to fall back +on this system. + +For the other build systems, such as ASDF, Emacs, Perl, Ruby and many more, the +process is very similar to the GNU build system except for a few specialized +arguments. + +Learn more about build systems in +@itemize +@item +@uref{https://www.gnu.org/software/guix/manual/en/html_node/Build-Systems.html#Build-Systems, the manual, section 4.2 Build systems}, +@item +the source code in the @samp{$GUIX_CHECKOUT/guix/build} and +@samp{$GUIX_CHECKOUT/guix/build-system} directories. +@end itemize + +@node Programmable and automated package definition +@subsection Programmable and automated package definition + +We can't repeat it enough: having a full-fledged programming language at hand +empowers us in ways that reach far beyond traditional package management. + +Let's illustrate this with some awesome features of Guix! + +@node Recursive importers +@subsubsection Recursive importers + +You might find some build systems good enough that there is little to do at all +to write a package, to the point that it becomes repetitive and tedious after a +while. A @emph{raison d'être} of computers is to replace human beings at those +boring tasks. So let's tell Guix to do this for us and create the package +definition of an R package from CRAN (the output is trimmed for conciseness): + +@example +$ guix import cran --recursive walrus + +(define-public r-mc2d + ; ... + (license gpl2+))) + +(define-public r-jmvcore + ; ... + (license gpl2+))) + +(define-public r-wrs2 + ; ... + (license gpl3))) + +(define-public r-walrus + (package + (name "r-walrus") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "walrus" version)) + (sha256 + (base32 + "1nk2glcvy4hyksl5ipq2mz8jy4fss90hx6cq98m3w96kzjni6jjj")))) + (build-system r-build-system) + (propagated-inputs + `(("r-ggplot2" ,r-ggplot2) + ("r-jmvcore" ,r-jmvcore) + ("r-r6" ,r-r6) + ("r-wrs2" ,r-wrs2))) + (home-page "https://github.com/jamovi/walrus") + (synopsis "Robust Statistical Methods") + (description + "This package provides a toolbox of common robust statistical +tests, including robust descriptives, robust t-tests, and robust ANOVA. +It is also available as a module for 'jamovi' (see + for more information). Walrus is based on the +WRS2 package by Patrick Mair, which is in turn based on the scripts and +work of Rand Wilcox. These analyses are described in depth in the book +'Introduction to Robust Estimation & Hypothesis Testing'.") + (license gpl3))) +@end example + +The recursive importer won't import packages for which Guix already has package +definitions, except for the very first. + +Not all applications can be packaged this way, only those relying on a select +number of supported systems. Read about the full list of importers in +the guix import section of the manual +(@pxref{Invoking guix import,,, guix, GNU Guix Reference Manual}). + +@node Automatic update +@subsubsection Automatic update + +Guix can be smart enough to check for updates on systems it knows. It can +report outdated package definitions with + +@example +$ guix refresh hello +@end example + +In most cases, updating a package to a newer version requires little more than +changing the version number and the checksum. Guix can do that automatically as +well: + +@example +$ guix refresh hello --update +@end example + +@node Inheritance +@subsubsection Inheritance + +If you've started browsing the existing package definitions, you might have +noticed that a significant number of them have a @code{inherit} field: + +@example +(define-public adwaita-icon-theme + (package (inherit gnome-icon-theme) + (name "adwaita-icon-theme") + (version "3.26.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "17fpahgh5dyckgz7rwqvzgnhx53cx9kr2xw0szprc6bnqy977fi8")))) + (native-inputs + `(("gtk-encode-symbolic-svg" ,gtk+ "bin"))))) +@end example + +All unspecified fields are inherited from the parent package. This is very +convenient to create alternative packages, for instance with different source, +version or compilation options. + +@node Getting help +@subsection Getting help + +Sadly, some applications can be tough to package. Sometimes they need a patch to +work with the non-standard filesystem hierarchy enforced by the store. +Sometimes the tests won't run properly. (They can be skipped but this is not +recommended.) Other times the resulting package won't be reproducible. + +Should you be stuck, unable to figure out how to fix any sort of packaging +issue, don't hesitate to ask the community for help. + +See the @uref{https://www.gnu.org/software/guix/contact/, Guix homepage} for information on the mailing lists, IRC, etc. + +@node Conclusion +@subsection Conclusion + +This tutorial was a showcase of the sophisticated package management that Guix +boasts. At this point we have mostly restricted this introduction to the +@code{gnu-build-system} which is a core abstraction layer on which more advanced +abstractions are based. + +Where do we go from here? Next we ought to dissect the innards of the build +system by removing all abstractions, using the @code{trivial-build-system}: this +should give us a thorough understanding of the process before investigating some +more advanced packaging techniques and edge cases. + +Other features worth exploring are the interactive editing and debugging +capabilities of Guix provided by the Guile REPL@. + +Those fancy features are completely optional and can wait; now is a good time +to take a well-deserved break. With what we've introduced here you should be +well armed to package lots of programs. You can get started right away and +hopefully we will see your contributions soon! + +@node References +@subsection References + +@itemize +@item +The @uref{https://www.gnu.org/software/guix/manual/en/html_node/Defining-Packages.html, package reference in the manual} + +@item +@uref{https://gitlab.com/pjotrp/guix-notes/blob/master/HACKING.org, Pjotr’s hacking guide to GNU Guix} + +@item +@uref{https://www.gnu.org/software/guix/guix-ghm-andreas-20130823.pdf, "GNU Guix: Package without a scheme!"}, by Andreas Enge +@end itemize @c ********************************************************************* @node System Configuration -- cgit v1.2.3 From ed79636c8b2c1e59a4ba2c5c0f3b561fbe15b025 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 28 Oct 2019 11:07:27 +0100 Subject: doc: Link to SICP Info page in "A Scheme Crash Course". * doc/guix-cookbook.texi (Scheme tutorials): Replace Emacs Info reader hint with more useful interactive link to SICP Info page. --- doc/guix-cookbook.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index 04eb5498ec..4e60862d22 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -269,7 +269,7 @@ online}, together with @uref{https://ocw.mit.edu/courses/electrical-engineering-and-computer-science/6-001-structure-and-interpretation-of-computer-programs-spring-2005/video-lectures/, videos of the lectures by the authors}. The book is available in Texinfo format as the @code{sicp} Guix package. Go ahead, run @code{guix install -sicp} and start reading with @code{info sicp} (or with the Emacs Info reader). +sicp} and start reading with @code{info sicp} (@pxref{,,, sicp, Structure and Interpretation of Computer Programs}). An @uref{https://sarabander.github.io/sicp/, unofficial ebook is also available}. -- cgit v1.2.3 From 6bb93af8553c746e50934792f3969f2e72013a14 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Sat, 26 Oct 2019 23:11:07 +0200 Subject: gnu: profanity: Add configure flags for better defaults. * gnu/packages/messaging.scm (profanity)[arguments]<#configure-flags>: Add --enable-omemo, --enable-notifications and --enable-icon, [native-inputs]: add libnotify and libsignal-protocol-c. Signed-off-by: Mathieu Othacehe --- gnu/packages/messaging.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index f890ad8dd5..b56a3e92cb 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1627,6 +1627,11 @@ are both supported).") (base32 "0nxh81j8ky0fzv47pip1jb7rs5rrin3jx0f3h632bvpjiya45r1z")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags + (list "--enable-omemo" + "--enable-icons" + "--enable-notifications"))) (inputs `(("curl" ,curl) ("expat" ,expat) @@ -1642,7 +1647,10 @@ are both supported).") ("autoconf-archive" ,autoconf-archive) ("automake" ,automake) ("cmocka" ,cmocka) + ("gtk+" ,gtk+-2) + ("libnotify" ,libnotify) ("libtool" ,libtool) + ("libsignal-protocol-c" ,libsignal-protocol-c) ("pkg-config" ,pkg-config))) (synopsis "Console-based XMPP client") (description "Profanity is a console based XMPP client written in C -- cgit v1.2.3 From 3dfd73f0a2362beddd70e910745a1ab452a714b8 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Sat, 26 Oct 2019 23:11:08 +0200 Subject: gnu: profanity: Update home-page URL. * gnu/packages/messaging.scm (profanity)[home-page]: Update URL. Signed-off-by: Mathieu Othacehe --- gnu/packages/messaging.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index b56a3e92cb..63b14287ce 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1655,7 +1655,7 @@ are both supported).") (synopsis "Console-based XMPP client") (description "Profanity is a console based XMPP client written in C using ncurses and libmesode, inspired by Irssi.") - (home-page "http://www.profanity.im") + (home-page "https://profanity-im.github.io") (license license:gpl3+))) (define-public libircclient -- cgit v1.2.3 From 7644b8b5a6fe1f0dfec9ca42c7611e90e7eb2173 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Sat, 26 Oct 2019 23:11:09 +0200 Subject: gnu: profanity: Add configure flags so that build fails if libs are missing. * gnu/packages/messaging.scm (profanity)[arguments]<#configure-flags>: Add --enable-c-plugins and --enable-otr. Signed-off-by: Mathieu Othacehe --- gnu/packages/messaging.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 63b14287ce..626aec4908 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1629,7 +1629,9 @@ are both supported).") (build-system gnu-build-system) (arguments '(#:configure-flags - (list "--enable-omemo" + (list "--enable-c-plugins" + "--enable-otr" + "--enable-omemo" "--enable-icons" "--enable-notifications"))) (inputs -- cgit v1.2.3 From a2c609953e4b7135c4e8880e174d11db7f9b03f0 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Sat, 26 Oct 2019 23:11:10 +0200 Subject: gnu: profanity: Enable pgp support. * gnu/packages/messaging.scm (profanity)[arguments]<#configure-flags>: Add --enable-pgp. Signed-off-by: Mathieu Othacehe --- gnu/packages/messaging.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 626aec4908..a6e9dcbbb3 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1632,6 +1632,7 @@ are both supported).") (list "--enable-c-plugins" "--enable-otr" "--enable-omemo" + "--enable-pgp" "--enable-icons" "--enable-notifications"))) (inputs -- cgit v1.2.3 From e24e652239f3574d223f196f7d693d2784d628d1 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Mon, 28 Oct 2019 11:16:13 +0100 Subject: gnu: evince: Update to 3.34.1. * gnu/packages/gnome.scm (evince): Update to 3.34.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 12993eadef..bb842574b2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -772,7 +772,7 @@ forgotten when the session ends.") (define-public evince (package (name "evince") - (version "3.30.2") + (version "3.34.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -780,7 +780,7 @@ forgotten when the session ends.") name "-" version ".tar.xz")) (sha256 (base32 - "0k7jln6dpg4bpv61niicjzkzyq6fhb3yfld7pc8ck71c8pmvsnx9")))) + "1pr6fvbaam1mzxjwyqd53hcxzdjzf73idn10j4j7n54nwg6hgr45")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags '("--disable-nautilus") -- cgit v1.2.3 From e927823c06f86aee5eb15369ae063257c743bde2 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Mon, 28 Oct 2019 11:20:00 +0100 Subject: gnu: dunst: Update to 1.4.1. * gnu/packages/dunst.scm (dunst): Update to 1.4.1. --- gnu/packages/dunst.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dunst.scm b/gnu/packages/dunst.scm index 31b7f58758..2621fc55ab 100644 --- a/gnu/packages/dunst.scm +++ b/gnu/packages/dunst.scm @@ -33,7 +33,7 @@ (define-public dunst (package (name "dunst") - (version "1.3.2") + (version "1.4.1") (source (origin (method url-fetch) (uri (string-append @@ -42,7 +42,7 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "12nj8qw3y3nl8sm24wizy2a7k06v1p88bnz1xr9l39h527xyidma")))) + "1zmx30qp2s9ca4q70j9ny4aq97pp442j9vfvsyihfcxgks6gwqqm")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no check target -- cgit v1.2.3 From 601171a9bc7ca6e4acb932895a07c0ca9aedfdac Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 28 Oct 2019 09:41:15 +0200 Subject: gnu: xorriso: Update to 1.5.2. * gnu/packages/cdrom.scm (xorriso): Update to 1.5.2. [source]: Remove patches. * gnu/packages/patches/xorriso-no-partition-table-in-inner-efi.patch, * gnu/packages/patches/xorriso-no-mbr-in-inner-efi.patch: Remove files. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 4 +- gnu/packages/cdrom.scm | 9 +- .../patches/xorriso-no-mbr-in-inner-efi.patch | 47 --------- .../xorriso-no-partition-table-in-inner-efi.patch | 107 --------------------- 4 files changed, 4 insertions(+), 163 deletions(-) delete mode 100644 gnu/packages/patches/xorriso-no-mbr-in-inner-efi.patch delete mode 100644 gnu/packages/patches/xorriso-no-partition-table-in-inner-efi.patch diff --git a/gnu/local.mk b/gnu/local.mk index ad5464cb86..5b81791542 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1445,9 +1445,7 @@ dist_patch_DATA = \ %D%/packages/patches/xfce4-panel-plugins.patch \ %D%/packages/patches/xfce4-settings-defaults.patch \ %D%/packages/patches/xinetd-fix-fd-leak.patch \ - %D%/packages/patches/xinetd-CVE-2013-4342.patch \ - %D%/packages/patches/xorriso-no-partition-table-in-inner-efi.patch \ - %D%/packages/patches/xorriso-no-mbr-in-inner-efi.patch + %D%/packages/patches/xinetd-CVE-2013-4342.patch MISC_DISTRO_FILES = \ %D%/packages/ld-wrapper.in diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index ef4ce022e4..59f32deb78 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013, 2014 Andreas Enge ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015 Paul van der Walt -;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016 Marius Bakke ;;; Copyright © 2017 John Darrington @@ -155,17 +155,14 @@ libcdio.") (define-public xorriso (package (name "xorriso") - (version "1.5.0") + (version "1.5.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/xorriso/xorriso-" version ".tar.gz")) (sha256 (base32 - "0aq6lvlwlkxz56l5sbvgycr6j5c82ch2bv6zrnc2345ibfpafgx9")) - (patches - (search-patches "xorriso-no-partition-table-in-inner-efi.patch" - "xorriso-no-mbr-in-inner-efi.patch")))) + "1rqpzj95f70jfwpn4lamasfgqpizjsipz12aprdhri777b4zas9v")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/xorriso-no-mbr-in-inner-efi.patch b/gnu/packages/patches/xorriso-no-mbr-in-inner-efi.patch deleted file mode 100644 index a43889d2c6..0000000000 --- a/gnu/packages/patches/xorriso-no-mbr-in-inner-efi.patch +++ /dev/null @@ -1,47 +0,0 @@ -https://dev.lovelyhq.com/libburnia/libisoburn/commit/1eb51f44dadb8b6c5f87533ca357186cdc1ac625 -diff --git a/frontend/grub-mkrescue-sed.sh b/frontend/grub-mkrescue-sed.sh -index b3948c99..dcd9d696 100755 ---- a/frontend/grub-mkrescue-sed.sh -+++ b/frontend/grub-mkrescue-sed.sh -@@ -120,6 +120,7 @@ fi - # "yes" overwrites the MBR partition table area in the EFI boot image by zeros. - # Some EFI implementations get stuck when seeing in the EFI partition a - # partition table entry which begins at LBA 0. -+# "extra" not only zeros the partition table but also the MBR signature. - efi_zero_inner_pt=no - if test -n "$MKRESCUE_SED_IN_EFI_NO_PT" - then -@@ -192,24 +193,31 @@ then - find "$dir" - fi - --if test "$efi_zero_inner_pt" = yes -+if test "$efi_zero_inner_pt" = yes -o "$efi_zero_inner_pt" = extra - then - did_dd=0 - if test -e "$dir"/efi.img - then -+ # Look for 0x55 0xAA in bytes 510 and 511 - magic=$(dd bs=1 skip=510 count=2 if="$dir"/efi.img 2>/dev/null | \ - od -c | head -1 | awk '{print $2 " " $3}') - if test "$magic" = "U 252" - then -+ echo "Performing actions for MKRESCUE_SED_IN_EFI_NO_PT=$efi_zero_inner_pt" >&2 - dd if=/dev/zero bs=1 seek=446 count=64 conv=notrunc of="$dir"/efi.img - did_dd=1 -+ if test "$efi_zero_inner_pt" = extra -+ then -+ dd if=/dev/zero bs=1 seek=510 count=2 conv=notrunc of="$dir"/efi.img -+ fi -+ echo >&2 - fi - fi - if test "$did_dd" = 0 - then - echo >&2 - echo "$0 : NOTE : No EFI image found or no MBR signature in it." >&2 -- echo "$0 : NOTE : Will not obey MKRESCUE_SED_IN_EFI_NO_PT=yes" >&2 -+ echo "$0 : NOTE : Will not obey MKRESCUE_SED_IN_EFI_NO_PT=$efi_zero_inner_pt" >&2 - echo >&2 - fi - fi diff --git a/gnu/packages/patches/xorriso-no-partition-table-in-inner-efi.patch b/gnu/packages/patches/xorriso-no-partition-table-in-inner-efi.patch deleted file mode 100644 index a719ca1f89..0000000000 --- a/gnu/packages/patches/xorriso-no-partition-table-in-inner-efi.patch +++ /dev/null @@ -1,107 +0,0 @@ -https://dev.lovelyhq.com/libburnia/libisoburn/commit/3a2a3ba737a06162c22ace0ae09d33ba97aa2673 -diff --git a/frontend/grub-mkrescue-sed.sh b/frontend/grub-mkrescue-sed.sh -index d772ff22..b3948c99 100755 ---- a/frontend/grub-mkrescue-sed.sh -+++ b/frontend/grub-mkrescue-sed.sh -@@ -1,6 +1,6 @@ - #!/bin/sh - --# Copyright (C) 2015 - 2016 -+# Copyright (C) 2015 - 2019 - # Thomas Schmitt , libburnia-project.org - # Provided under BSD license: Use, modify, and distribute as you like. - -@@ -117,6 +117,15 @@ fi - # command line.) - # Each argument must be a single word. No whitespace. No quotation marks. - -+# "yes" overwrites the MBR partition table area in the EFI boot image by zeros. -+# Some EFI implementations get stuck when seeing in the EFI partition a -+# partition table entry which begins at LBA 0. -+efi_zero_inner_pt=no -+if test -n "$MKRESCUE_SED_IN_EFI_NO_PT" -+then -+ efi_zero_inner_pt="$MKRESCUE_SED_IN_EFI_NO_PT" -+fi -+ - - # - # Do the work -@@ -183,12 +192,48 @@ then - find "$dir" - fi - -+if test "$efi_zero_inner_pt" = yes -+then -+ did_dd=0 -+ if test -e "$dir"/efi.img -+ then -+ magic=$(dd bs=1 skip=510 count=2 if="$dir"/efi.img 2>/dev/null | \ -+ od -c | head -1 | awk '{print $2 " " $3}') -+ if test "$magic" = "U 252" -+ then -+ dd if=/dev/zero bs=1 seek=446 count=64 conv=notrunc of="$dir"/efi.img -+ did_dd=1 -+ fi -+ fi -+ if test "$did_dd" = 0 -+ then -+ echo >&2 -+ echo "$0 : NOTE : No EFI image found or no MBR signature in it." >&2 -+ echo "$0 : NOTE : Will not obey MKRESCUE_SED_IN_EFI_NO_PT=yes" >&2 -+ echo >&2 -+ fi -+fi -+ - efi_tmp_name= -+if test x"$mode" = xmjg \ -+ -o x"$mode" = xmbr_only \ -+ -o x"$mode" = xgpt_appended \ -+ -o x"$mode" = xmbr_hfs -+then -+ # Move EFI partition image file out of the "$dir" tree, i.e. out of the ISO -+ efi_tmp_name=grub-mkrescue-sed-efi-img.$$ -+ if test -e "$dir"/efi.img -+ then -+ mv "$dir"/efi.img /tmp/$efi_tmp_name -+ elif test -e /tmp/$efi_tmp_name -+ then -+ rm /tmp/$efi_tmp_name -+ fi -+fi -+ - if test x"$mode" = xmjg - then - # Exchange arguments for the experimental GRUB2 mjg layout -- efi_tmp_name=grub-mkrescue-sed-efi-img.$$ -- mv "$dir"/efi.img /tmp/$efi_tmp_name - x=$(echo " $*" | sed \ - -e "s/-efi-boot-part --efi-boot-image/-no-pad -append_partition $partno 0xef \/tmp\/$efi_tmp_name/" \ - -e "s/--efi-boot efi\.img/-eltorito-alt-boot -e --interval:appended_partition_${partno}:all:: -no-emul-boot -isohybrid-gpt-basdat/" \ -@@ -207,8 +252,6 @@ then - elif test x"$mode" = xmbr_only - then - # Exchange arguments for no-HFS MBR-only layout -- efi_tmp_name=grub-mkrescue-sed-efi-img.$$ -- mv "$dir"/efi.img /tmp/$efi_tmp_name - x=$(echo " $*" | sed \ - -e "s/-efi-boot-part --efi-boot-image/$iso_mbr_part_type -no-pad -append_partition 2 0xef \/tmp\/$efi_tmp_name/" \ - -e "s/--efi-boot efi\.img/-eltorito-alt-boot -e --interval:appended_partition_2:all:: -no-emul-boot/" \ -@@ -228,8 +271,6 @@ then - elif test x"$mode" = xmbr_hfs - then - # Exchange arguments for MBR and HFS+ layout -- efi_tmp_name=grub-mkrescue-sed-efi-img.$$ -- mv "$dir"/efi.img /tmp/$efi_tmp_name - x=$(echo " $*" | sed \ - -e "s/-efi-boot-part --efi-boot-image/$iso_mbr_part_type -no-pad -append_partition 2 0xef \/tmp\/$efi_tmp_name/" \ - -e "s/--efi-boot efi\.img/-eltorito-alt-boot -e --interval:appended_partition_2:all:: -no-emul-boot/" \ -@@ -247,8 +288,6 @@ then - elif test x"$mode" = xgpt_appended - then - # Exchange arguments for no-HFS MBR-only layout -- efi_tmp_name=grub-mkrescue-sed-efi-img.$$ -- mv "$dir"/efi.img /tmp/$efi_tmp_name - x=$(echo " $*" | sed \ - -e "s/-efi-boot-part --efi-boot-image/-no-pad -append_partition 2 0xef \/tmp\/$efi_tmp_name -appended_part_as_gpt -partition_offset 16/" \ - -e "s/--efi-boot efi\.img/-eltorito-alt-boot -e --interval:appended_partition_2:all:: -no-emul-boot/" \ -- cgit v1.2.3 From 8c8d60752e1ad73d5bd87d8497b357f8a8a389ab Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 28 Oct 2019 15:54:47 +0100 Subject: derivation: Remove memoization invalidation for 'derivation->bytevector'. This is a followup to d727a9343d861cf775645df8be5bfefd43d6c6f0, which broke 'hydra-jobs' from (gnu ci). * guix/derivations.scm (invalidate-derivation-caches!): Remove call to 'invalidate-memoization!' for 'derivation->bytevector'. --- guix/derivations.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/guix/derivations.scm b/guix/derivations.scm index 706c650469..bde937044a 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -919,7 +919,6 @@ derivation. It is kept as-is, uninterpreted, in the derivation." long-running processes that know what they're doing. Use with care!" ;; Typically this is meant to be used by Cuirass and Hydra, which can clear ;; caches when they start evaluating packages for another architecture. - (invalidate-memoization! derivation->bytevector) (invalidate-memoization! derivation-base16-hash) ;; FIXME: Comment out to work around . -- cgit v1.2.3 From 8ca565ec1a0f0c3a5b7acf9d323e345e40be1473 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 28 Oct 2019 12:49:49 +0100 Subject: gnu: x265: Update to 3.2. * gnu/packages/video.scm (x265): Update to 3.2. --- gnu/packages/video.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index cef2d50a89..97af4b84f7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -508,7 +508,7 @@ H.264 (MPEG-4 AVC) video streams.") (define-public x265 (package (name "x265") - (version "3.1.2") + (version "3.2") (outputs '("out" "static")) (source (origin @@ -518,8 +518,7 @@ H.264 (MPEG-4 AVC) video streams.") (string-append "https://download.videolan.org/videolan/x265/" "x265_" version ".tar.gz"))) (sha256 - (base32 - "1ajr59gjj47gnczfb2qhmzclj746pdiq9a1d81b0mq22k8f5yy3g")) + (base32 "0fqkhfhr22gzavxn60cpnj3agwdf5afivszxf3haj5k1sny7jk9n")) (patches (search-patches "x265-arm-flags.patch")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 57705f47497b97a0ed42362148f4a523ae5fc8ce Mon Sep 17 00:00:00 2001 From: Jesse Gibbons Date: Wed, 9 Oct 2019 22:29:16 -0600 Subject: gnu: add filters. * gnu/packages/toys.scm (filters): New variable. Signed-off-by: Tobias Geerinckx-Rice . --- gnu/packages/toys.scm | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm index 87706d2277..8c1a03b5d2 100644 --- a/gnu/packages/toys.scm +++ b/gnu/packages/toys.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Jesse Gibbons ;;; ;;; This file is part of GNU Guix. ;;; @@ -17,7 +18,10 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages toys) + #:use-module (gnu packages bison) + #:use-module (gnu packages flex) #:use-module (gnu packages ncurses) + #:use-module (gnu packages perl) #:use-module (guix build-system gnu) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) @@ -64,3 +68,91 @@ on the text terminal. It serves no useful purpose but to discourage mistakenly typing @command{sl} instead of @command{ls}.") (license (license:non-copyleft "file://LICENSE" "See LICENSE in the distribution.")))) + +(define-public filters + (let ((version "2.55") + (commit "c5c291916b52ed9e6418448a8eee30475fb9adcf")) + (package + (name "filters") + (version "2.55") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.joeyh.name/filters") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gaigpda1w9wxfh8an3sam1hpacc1bhxl696w4yj0vzhc6izqvxs")) + (modules '((guix build utils))) + (snippet '(begin + ;; kenny is under nonfree Artistic License (Perl) 1.0. + (delete-file "kenny") + (substitute* "Makefile" + (("kenny") + "")))))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list "CC=gcc" (string-append "DESTDIR=" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'fix-install-directories + (lambda _ + (substitute* "Makefile" + (("/usr/games") + "/bin/") + (("/usr/share/") + "/share/")) + #t))) + #:tests? #f)) ; no test suite + (native-inputs + `(("bison" ,bison) + ("flex" ,flex))) + (inputs + `(("perl" ,perl))) + (home-page "https://joeyh.name/code/filters/") + (synopsis "Various amusing text filters") + (description + "The filters collection harks back to the late 1980s, when various text +filters were written to munge written language in amusing ways. The earliest +and best known were legends such as the Swedish Chef filter and B1FF. + +This package contains the following filter commands: +@enumerate +@item b1ff: a satire of a stereotypical Usenet newbie +@item censor: comply with the @acronym{CDA, Communications Decency Act} +@item chef: convert English to Mock Swedish +@item cockney: Cockney English +@item elee: k3wl hacker slang +@item fanboy: a stereotypical fan (supports custom fandoms) +@item fudd: Elmer Fudd +@item jethro: hillbilly text filter +@item jibberish: a random selection of these filters +@item jive: Jive English +@item ken: turn English into Cockney +@item kraut: a bad German accent +@item ky00te: a very cute accent +@item LOLCAT: as seen in Internet GIFs everywhere +@item nethackify: wiped-out text as found in nethack +@item newspeak: à la 1984 +@item nyc: Brooklyn English +@item pirate: talk like a pirate +@item rasterman: straight from the keyboard of Carsten Haitzler +@item scottish: fake Scottish (Dwarven) accent +@item scramble: scramble the \"inner\" letters of each word +@item spammer: turn honest text into something liable to be flagged as spam +@item studly: studly caps. +@item uniencode: use glorious Unicode to the fullest possible extent +@item upside-down: flip the text upside down +@end enumerate + +The GNU project hosts a similar collection of filters, the GNU talkfilters.") + (license ; see debian/copyright + (list license:gpl2+ ; most of the filters + license:gpl2 ; rasterman, ky00te.dir/* nethackify, pirate + license:gpl3+ ; scramble, scottish + license:public-domain ; jethro, kraut, ken, studly + license:gpl1+ ; cockney, jive, nyc only say "gpl" + license:expat))))) ; newspeak -- cgit v1.2.3 From 42521ab225e031517790dc738ee7a5d8fc846f72 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 28 Oct 2019 21:10:37 +0100 Subject: gnu: vim-syntastic: Update to 3.10.0. * gnu/packages/vim.scm (vim-syntastic): Update to 3.10.0. --- gnu/packages/vim.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 63bd50390c..fbc0b48898 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Marius Bakke -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 HiPhish ;;; Copyright © 2019 Julien Lepiller ;;; @@ -609,7 +609,7 @@ and powerline symbols, etc.") (define-public vim-syntastic (package (name "vim-syntastic") - (version "3.9.0") + (version "3.10.0") (source (origin (method git-fetch) @@ -618,8 +618,7 @@ and powerline symbols, etc.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "121a1mxgfng2y5zmivyyk02mca8pyw72crivf4f1q9nhn0barf57")))) + (base32 "0j91f72jaz1s6aw1hpjiz30vk2ds2aqd9gisk91grsldy6nz6hhz")))) (build-system gnu-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From aa243f9d4830cdaffd554be87d817f35a9ec6f9d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 28 Oct 2019 21:22:16 +0100 Subject: gnu: ndctl: Update to 67. * gnu/packages/disk.scm (ndctl): Update to 67. --- gnu/packages/disk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 08ce9eb2d7..88a917dda7 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -612,7 +612,7 @@ passphrases.") (define-public ndctl (package (name "ndctl") - (version "65") + (version "67") (source (origin (method git-fetch) (uri (git-reference @@ -621,7 +621,7 @@ passphrases.") (file-name (git-file-name name version)) (sha256 (base32 - "0d8hzfvyxs2q8kgkwgdizlml41kin4mhx3vpdsjk34pfi7mqy69y")))) + "076jgw1g2aafqgnq705in0wnabysqk46dq5yxdv1qzgjmyhka39n")))) (build-system gnu-build-system) (native-inputs `(("asciidoc" ,asciidoc) -- cgit v1.2.3 From 6b00a5f4a79819db08cb4d8e9f24a01445b7962b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 28 Oct 2019 22:12:37 +0100 Subject: news: Fix typo. Reported by Eric Bavier . * etc/news.scm: Fix typo in English title of latest news item. --- etc/news.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/news.scm b/etc/news.scm index 8f79848b7f..5bcd075057 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -11,7 +11,7 @@ (entry (commit "49af34cfac89d384c46269bfd9388b2c73b1220a") (title (en "@command{guix pull} now honors -@file{/etc/guix/channels.scm") +@file{/etc/guix/channels.scm}") (fr "@command{guix pull} lit maintenant @file{/etc/guix/channels.scm}")) (body -- cgit v1.2.3 From d332fd860f89ed426a2b05eaa8f7a76ff6aab58f Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 28 Oct 2019 13:33:43 -0700 Subject: gnu: diffoscope: Update to 129. * gnu/packages/diffoscope (diffoscope): Update to 129. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 23acf0aeb8..47dd36b919 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -67,7 +67,7 @@ #:use-module (ice-9 match)) (define-public diffoscope - (let ((version "126")) + (let ((version "129")) (package (name "diffoscope") (version version) @@ -79,7 +79,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0lmn2116g5l05nns8qd2kwsnnd144zrqhs53fsr88inzf0mkqwhj")))) + "1r8hq93gga9n4jv4fyf1divc9cwvvjadkzl47lazzrfy3nn1qjwr")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 2a74f9284e7a798c26938d8475522c8312c33dea Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 28 Oct 2019 21:54:16 +0100 Subject: gnu: python-lxml: Update to 4.4.1. * gnu/packages/python-xyz.scm (python-lxml): Update to 4.4.1. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 476ac2f588..3a3c573c6f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5963,14 +5963,14 @@ the GObject Introspection bindings to libnotify for non-GTK applications.") (define-public python-lxml (package (name "python-lxml") - (version "4.2.5") + (version "4.4.1") (source (origin (method url-fetch) (uri (pypi-uri "lxml" version)) (sha256 (base32 - "0zw0y9hs0nflxhl9cs6ipwwh53szi3w2x06wl0k9cylyqac0cwin")))) + "14jnpfcpgqr9sx8ppd286jzcbk0b36hbqsvd8jkvffipzw5v8768")))) (build-system python-build-system) (inputs `(("libxml2" ,libxml2) -- cgit v1.2.3 From 2f3c2dafefa08244e0d5834f06416d8dd5a102e4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 28 Oct 2019 22:33:09 +0100 Subject: gnu: python-lxml: Run the test suite. * gnu/packages/python-xyz.scm (python-lxml)[arguments]: New field. --- gnu/packages/python-xyz.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3a3c573c6f..e11a3ea42b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5972,6 +5972,11 @@ the GObject Introspection bindings to libnotify for non-GTK applications.") (base32 "14jnpfcpgqr9sx8ppd286jzcbk0b36hbqsvd8jkvffipzw5v8768")))) (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "make" "test")))))) (inputs `(("libxml2" ,libxml2) ("libxslt" ,libxslt))) -- cgit v1.2.3 From 3ce91d44290cee4e10d4436d3fcfba4141b67fcb Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 28 Oct 2019 18:44:14 +0100 Subject: gnu: python-pyro4: Update to 4.77. * gnu/packages/python-xyz.scm (python-pyro4): Update to 4.77. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e11a3ea42b..bf5371c07a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14329,14 +14329,20 @@ such as figshare or Zenodo.") (define-public python-pyro4 (package (name "python-pyro4") - (version "4.75") + (version "4.77") (source (origin (method url-fetch) (uri (pypi-uri "Pyro4" version)) (sha256 - (base32 "1dfpp36imddx19yv0kd28gk1l71ckhpqy6jd590wpm2680jw15rq")))) + (base32 "0gsjg869y4gpy265s1gj1f2qy6jn5iz8r2bwwnq78r1r5yi15zib")))) (build-system python-build-system) + (arguments + '(#:tests? #f)) ;FIXME: Some tests require network access. + (native-inputs + `(("python-cloudpickle" ,python-cloudpickle) + ("python-dill" ,python-dill) + ("python-msgpack" ,python-msgpack))) (propagated-inputs `(("python-serpent" ,python-serpent))) (home-page "https://pyro4.readthedocs.io") -- cgit v1.2.3 From b2b8a39c4130b6a7bb1c9a96078cd14f0f086860 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 28 Oct 2019 18:23:58 +0100 Subject: gnu: python-coloredlogs: Update to 10.0. * gnu/packages/python-xyz.scm (python-coloredlogs): Update to 10.0. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bf5371c07a..04d72e285b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -933,14 +933,14 @@ add the log levels NOTICE, SPAM, SUCCESS and VERBOSE.") (define-public python-coloredlogs (package (name "python-coloredlogs") - (version "7.3") + (version "10.0") (source (origin (method url-fetch) (uri (pypi-uri "coloredlogs" version)) (sha256 (base32 - "1blcann6dyg5dhps9pg12rn0q0rjrlajpmmil0gy0j4cbvnl2il9")))) + "0dkw6xp0r1dwgz4s2f58npx5nxfq51wf4l6qkm5ib27slgfs4sdq")))) (build-system python-build-system) (arguments `(;Tests require some updated modules -- cgit v1.2.3 From 84836379cd63f427dedda619d97aee0b352b86cd Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Tue, 29 Oct 2019 00:46:33 +0900 Subject: gnu: scdoc: Set PREFIX instead of patching Makefile. * gnu/packages/man.scm (scdoc)[arguments]: Set PREFIX instead of patching Makefile with output path. Signed-off-by: Marius Bakke --- gnu/packages/man.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 86efe64e52..e7e14c54ae 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -251,15 +251,11 @@ automatically.") "00zc3rzj97gscby31djlqyczvqpyhrl66i44czwzmmn7rc5j03m1")))) (build-system gnu-build-system) (arguments - `(#:make-flags '("CC=gcc") + `(#:make-flags + (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases - (delete 'configure) - (add-before 'install 'hardcode-paths - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile" - (("/usr/local") (assoc-ref outputs "out"))) - #t))))) + (delete 'configure)))) (home-page "https://git.sr.ht/~sircmpwn/scdoc") (synopsis "Simple man page generator") (description "scdoc is a simple man page generator written for POSIX systems -- cgit v1.2.3 From e27a9c18974aae4b628c6ae400ddfdf06d1679e0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 28 Oct 2019 22:38:21 +0100 Subject: gnu: emacs-csv-mode: Update to 1.10. * gnu/packages/emacs-xyz.scm (emacs-csv-mode): Update to 1.10. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 688206452e..0ce8739a77 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10823,14 +10823,14 @@ let users kill or mark things easily.") (define-public emacs-csv-mode (package (name "emacs-csv-mode") - (version "1.9") + (version "1.10") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/csv-mode-" version ".el")) (sha256 - (base32 "0sdnyi9in904k49yy5imapypnmk75lv14k9c1yyjhjpalvvh6br1")))) + (base32 "0q7j2cmj7vs6hz8cnf7j7lmlcjmig3jn2p6az345z96agl8a5xsq")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/csv-mode.html") (synopsis "Major mode for editing comma/char separated values") -- cgit v1.2.3 From b3cbae383679a7c294c81df11917c1c80cb25abe Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 28 Oct 2019 23:06:18 +0100 Subject: gnu: gtkmm: Update to 3.24.2. * gnu/packages/gtk.scm (gtkmm): Update to 3.24.2. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 74f61967f6..b0dd0c6cc6 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1093,7 +1093,7 @@ toolkit.") (define-public gtkmm (package (name "gtkmm") - (version "3.24.1") + (version "3.24.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1101,7 +1101,7 @@ toolkit.") name "-" version ".tar.xz")) (sha256 (base32 - "1zfj89spr8ianib5y10wcw63ybdmyjy58a15vqs0m8jq4knl5znx")))) + "1hxdnhavjyvbcpxhd5z17l9fj4182028s66lc0s16qqqrldhjwbd")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib "bin") ;for 'glib-compile-resources' -- cgit v1.2.3 From 3b97a00d82a203427be96b3592b08b064e869131 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 28 Oct 2019 23:07:06 +0100 Subject: gnu: perl-scalar-list-utils: Update to 1.53. * gnu/packages/perl.scm (perl-scalar-list-utils): Update to 1.53. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index d9adf7fe42..35722f992e 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -9631,15 +9631,14 @@ files, using JSON::PP and/or CPAN::Meta::YAML.") (define-public perl-scalar-list-utils (package (name "perl-scalar-list-utils") - (version "1.50") + (version "1.53") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/P/PE/PEVANS/" "Scalar-List-Utils-" version ".tar.gz")) (sha256 - (base32 - "0x9n0617gjjcqa4nk5biiwkxdi90xpdfg6z07gjr009qjg3bkah6")))) + (base32 "16dfpnrcf5846j998rdd6gra16m9030rnz9fpsh1hfzvcsq8ch5x")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Scalar-List-Utils") (synopsis "Common Scalar and List utility subroutines") -- cgit v1.2.3 From 5c4772d7be030cec97df8e6545465cbcc033f5ac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 28 Oct 2019 23:10:08 +0100 Subject: gnu: fluidsynth: Update to 2.0.8. * gnu/packages/audio.scm (fluidsynth): Update to 2.0.8. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 110903e2fe..88b5696a9b 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1107,7 +1107,7 @@ follower.") (define-public fluidsynth (package (name "fluidsynth") - (version "2.0.7") + (version "2.0.8") (source (origin (method git-fetch) (uri (git-reference @@ -1116,7 +1116,7 @@ follower.") (file-name (git-file-name name version)) (sha256 (base32 - "1h1dj3wmjwzny2hgr41k3p67w4kxvzn365kkqwyfd6yk0v3rahic")))) + "1s32c0jxjica2agy0mp36vgvpgj2vl5i5zvacd6igmbam0x4gs7c")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no check target -- cgit v1.2.3 From ec84186fe4c4d88c2fef37c6044d49baca6a8149 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 28 Oct 2019 23:31:48 +0100 Subject: gnu: libisofs: Update to 1.5.2. * gnu/packages/cdrom.scm (libisofs): Update to 1.5.2. --- gnu/packages/cdrom.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 59f32deb78..9c2b11c047 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -812,14 +812,14 @@ DVD-RW, DVD-R, DVD-R/DL, BD-R, and BD-RE.") (define-public libisofs (package (name "libisofs") - (version "1.5.0") + (version "1.5.2") (source (origin (method url-fetch) (uri (string-append "http://files.libburnia-project.org/releases/" "libisofs-" version ".tar.gz")) (sha256 (base32 - "001l3akf3wb6msl9man776w560iqyvsbwwzs7d7y7msx13irspys")))) + "002mcyqwg625a8hqvsrmgm26mhhfwj0j7rahfhsqirmk02b16npg")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) -- cgit v1.2.3 From 0aa217e7600f54cae1d595714bfd5d77d0cab970 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 28 Oct 2019 23:51:30 +0100 Subject: gnu: libasr: Update to 1.0.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/dns.scm (libasr): Update to 1.0.3. [arguments]: Replace ‘bootstrap’ and add ‘install-documentation’ phase. [native-inputs]: Add libtool and remove groff. --- gnu/packages/dns.scm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index e120983f80..ec4008bf19 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -273,21 +273,33 @@ the two.") (define-public libasr (package (name "libasr") - (version "201602131606") + (version "1.0.3") (source (origin (method url-fetch) (uri (string-append "https://www.opensmtpd.org/archives/" "libasr-" version ".tar.gz")) (sha256 - (base32 - "18kdmbjsxrfai16d66qslp48b1zf7gr8him2jj5dcqgbsl44ls75")))) + (base32 "13fn4sr4vlcx1xijpl26nmnxawyls4lr5q3mi11jdm76f80qxn4w")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'bootstrap + ;; ‘GNU build system bootstrapping not needed’, the default lies. + (lambda _ + (invoke "sh" "./bootstrap"))) + (add-after 'install 'install-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "src/asr_run.3" + (string-append out "/share/man/man3")) + #t)))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("pkg-config" ,pkg-config) - ("groff" ,groff))) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) (home-page "https://www.opensmtpd.org") (synopsis "Asynchronous resolver library by the OpenBSD project") (description -- cgit v1.2.3 From a95533ac86df1ea0bf8608575a4ce13ce4998ae8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 29 Oct 2019 00:00:54 +0100 Subject: gnu: perl-cpanel-json-xs: Update to 4.15. * gnu/packages/perl.scm (perl-cpanel-json-xs): Update to 4.15. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 35722f992e..d6976b79b7 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -1611,14 +1611,14 @@ CPAN::Meta object are present.") (define-public perl-cpanel-json-xs (package (name "perl-cpanel-json-xs") - (version "4.12") + (version "4.15") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RU/RURBAN/" "Cpanel-JSON-XS-" version ".tar.gz")) (sha256 - (base32 "0n66da8s88srr591i7gm1d611z9jbcz488fhqxy604diiw8pnha9")))) + (base32 "1695408fj6jjx6dv5082hhxg5am480x1nz7s0f355npv0wm776wx")))) (build-system perl-build-system) (propagated-inputs `(("perl-common-sense" ,perl-common-sense))) -- cgit v1.2.3 From ce23c5ffd2cbb123943c424f09d1442f557a14ed Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 29 Oct 2019 01:53:07 +0100 Subject: gnu: avidemux: Update to 2.7.4. * gnu/packages/video.scm (avidemux): Update to 2.7.4. [arguments]: Update bundled ffmpeg version. --- gnu/packages/video.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 97af4b84f7..2b4f16207d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1925,7 +1925,7 @@ for use with HTML5 video.") (define-public avidemux (package (name "avidemux") - (version "2.7.3") + (version "2.7.4") (source (origin (method url-fetch) (uri (string-append @@ -1933,7 +1933,7 @@ for use with HTML5 video.") "avidemux_" version ".tar.gz")) (sha256 (base32 - "17x2mnnr5h8pp764p55l1xcn2ljnzhbj8cykajlllvk4rc4qwxld")) + "1acdb3m37vdzzbm8mwyibcn8msi7birb5v30qfi7jli5r00src3x")) (patches (search-patches "avidemux-install-to-lib.patch")))) (build-system cmake-build-system) (native-inputs @@ -1966,7 +1966,7 @@ for use with HTML5 video.") #:phases ;; Make sure files inside the included ffmpeg tarball are ;; patch-shebanged. - (let ((ffmpeg "ffmpeg-4.1.1")) + (let ((ffmpeg "ffmpeg-4.1.4")) (modify-phases %standard-phases (add-before 'patch-source-shebangs 'unpack-ffmpeg (lambda _ -- cgit v1.2.3 From a06193603b7e7922439fc5a9d616b7ef872b8b03 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 26 Oct 2019 22:17:05 -0400 Subject: gnu: icecat: Include generally-useful fixes in the source tarball. This commit moves some important fixes into a patch applied to the upstream gnuzilla git repository, whereas previously they were applied in such a way that only benefitted Guix users. * gnu/packages/patches/icecat-default-search-ddg.patch, gnu/packages/patches/icecat-disable-sync.patch: Delete files. * gnu/packages/patches/icecat-gnuzilla-fixes.patch: New file. * gnu/local.mk (dist_patch_DATA): Adapt accordingly. * gnu/packages/gnuzilla.scm (icecat-source): Apply the new patch to the gnuzilla checkout. (icecat)[native-inputs]: Remove deleted patches. [arguments]: In the 'wrap-program' phase, remove MOZ_LEGACY_PROFILES=1 from the wrapper. --- gnu/local.mk | 3 +- gnu/packages/gnuzilla.scm | 11 +- .../patches/icecat-default-search-ddg.patch | 1108 ------------------- gnu/packages/patches/icecat-disable-sync.patch | 9 - gnu/packages/patches/icecat-gnuzilla-fixes.patch | 1164 ++++++++++++++++++++ gnu/packages/patches/icecat-makeicecat.patch | 4 +- 6 files changed, 1172 insertions(+), 1127 deletions(-) delete mode 100644 gnu/packages/patches/icecat-default-search-ddg.patch delete mode 100644 gnu/packages/patches/icecat-disable-sync.patch create mode 100644 gnu/packages/patches/icecat-gnuzilla-fixes.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5b81791542..1b04485422 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -975,9 +975,8 @@ dist_patch_DATA = \ %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \ %D%/packages/patches/hplip-remove-imageprocessor.patch \ %D%/packages/patches/hydra-disable-darcs-test.patch \ + %D%/packages/patches/icecat-gnuzilla-fixes.patch \ %D%/packages/patches/icecat-makeicecat.patch \ - %D%/packages/patches/icecat-default-search-ddg.patch \ - %D%/packages/patches/icecat-disable-sync.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \ %D%/packages/patches/icecat-use-system-media-libs.patch \ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index db7106c4da..3902f490d0 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -588,6 +588,8 @@ from forcing GEXP-PROMISE." (base32 "1ll3j2kpsfp1f9dxy67fay1cidsng02l8a3a23wdjqkxgrg1cf4g")))) + (gnuzilla-fixes-patch + (local-file (search-patch "icecat-gnuzilla-fixes.patch"))) (makeicecat-patch (local-file (search-patch "icecat-makeicecat.patch")))) @@ -633,6 +635,8 @@ from forcing GEXP-PROMISE." (with-directory-excursion "/tmp/gnuzilla" (make-file-writable "makeicecat") + (invoke "patch" "--force" "--no-backup-if-mismatch" + "-p1" "--input" #+gnuzilla-fixes-patch) (invoke "patch" "--force" "--no-backup-if-mismatch" "-p1" "--input" #+makeicecat-patch) (patch-shebang "makeicecat") @@ -772,10 +776,6 @@ from forcing GEXP-PROMISE." ;; ,(search-patch "icecat-use-system-graphite2+harfbuzz.patch")) ;; ("icecat-use-system-media-libs.patch" ;; ,(search-patch "icecat-use-system-media-libs.patch")) - ("icecat-default-search-ddg.patch" - ,(search-patch "icecat-default-search-ddg.patch")) - ("icecat-disable-sync.patch" - ,(search-patch "icecat-disable-sync.patch")) ("patch" ,(canonical-package patch)) @@ -1079,8 +1079,7 @@ from forcing GEXP-PROMISE." (pulseaudio-lib (string-append pulseaudio "/lib"))) (wrap-program (car (find-files lib "^icecat$")) `("XDG_DATA_DIRS" prefix (,gtk-share)) - `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib)) - `("MOZ_LEGACY_PROFILES" = ("1"))) + `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib))) #t)))))) (home-page "https://www.gnu.org/software/gnuzilla/") (synopsis "Entirely free browser derived from Mozilla Firefox") diff --git a/gnu/packages/patches/icecat-default-search-ddg.patch b/gnu/packages/patches/icecat-default-search-ddg.patch deleted file mode 100644 index 9eea07bcab..0000000000 --- a/gnu/packages/patches/icecat-default-search-ddg.patch +++ /dev/null @@ -1,1108 +0,0 @@ ---- a/browser/components/search/SearchTelemetry.jsm.orig 1980-01-01 18:59:51.000000000 -0500 -+++ b/browser/components/search/SearchTelemetry.jsm 2019-10-25 06:58:49.564335696 -0400 -@@ -40,6 +40,12 @@ - * page mightbe an advert. - */ - const SEARCH_PROVIDER_INFO = { -+ duckduckgo: { -+ regexp: /^https:\/\/duckduckgo\.com\//, -+ queryParam: "q", -+ codeParam: "t", -+ codePrefixes: ["ff"], -+ }, - google: { - regexp: /^https:\/\/www\.google\.(?:.+)\/search/, - queryParam: "q", -@@ -50,12 +56,6 @@ - /^https:\/\/www\.googleadservices\.com\/(?:pagead\/)?aclk/, - ], - }, -- duckduckgo: { -- regexp: /^https:\/\/duckduckgo\.com\//, -- queryParam: "q", -- codeParam: "t", -- codePrefixes: ["ff"], -- }, - yahoo: { - regexp: /^https:\/\/(?:.*)search\.yahoo\.com\/search/, - queryParam: "p", ---- a/browser/components/search/extensions/list.json.orig 1980-01-01 18:59:51.000000000 -0500 -+++ b/browser/components/search/extensions/list.json 2019-10-25 07:27:58.209006756 -0400 -@@ -1,9 +1,9 @@ - { - "default": { -- "searchDefault": "Google", -- "searchOrder": ["Google", "Bing"], -+ "searchDefault": "DuckDuckGo", -+ "searchOrder": ["DuckDuckGo", "Google", "Bing"], - "visibleDefaultEngines": [ -- "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia" -+ "ddg", "google-b-d", "amazondotcom", "bing", "ebay", "twitter", "wikipedia" - ] - }, - "regionOverrides": { -@@ -54,32 +54,32 @@ - "en-US": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia" -+ "ddg", "google-b-d", "amazondotcom", "bing", "ebay", "twitter", "wikipedia" - ] - }, - "KZ": { - "visibleDefaultEngines": [ -- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" -+ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "BY": { - "visibleDefaultEngines": [ -- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" -+ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "RU": { - "visibleDefaultEngines": [ -- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" -+ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "TR": { - "visibleDefaultEngines": [ -- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" -+ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "experimental-hidden": { - "visibleDefaultEngines": [ -@@ -90,131 +90,131 @@ - "ach": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" -+ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" - ] - } - }, - "af": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-af" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-af" - ] - } - }, - "an": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ebay-es", "wikipedia-an", "ddg", "twitter" -+ "ddg", "google-b-d", "bing", "ebay-es", "wikipedia-an", "twitter" - ] - } - }, - "ar": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ar" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-ar" - ] - } - }, - "as": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-in", "ddg", "wikipedia-as" -+ "ddg", "google-b-d", "amazon-in", "wikipedia-as" - ] - } - }, - "ast": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "ebay-es", "wikipedia-ast" -+ "ddg", "google-b-d", "bing", "ebay-es", "wikipedia-ast" - ] - } - }, - "az": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazondotcom", "azerdict", "bing", "ddg", "wikipedia-az", "yandex-az" -+ "ddg", "google-b-d", "amazondotcom", "azerdict", "bing", "wikipedia-az", "yandex-az" - ] - } - }, - "be": { - "default": { - "visibleDefaultEngines": [ -- "yandex-by", "google-b-d", "ddg", "wikipedia-be", "wikipedia-be-tarask" -+ "ddg", "yandex-by", "google-b-d", "wikipedia-be", "wikipedia-be-tarask" - ] - }, - "BY": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - }, - "KZ": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - }, - "RU": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - }, - "TR": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - } - }, - "bg": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazondotcom", "ddg", "pazaruvaj", "wikipedia-bg" -+ "ddg", "google-b-d", "amazondotcom", "pazaruvaj", "wikipedia-bg" - ] - } - }, - "bn": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-in", "bing", "ddg", "wikipedia-bn" -+ "ddg", "google-b-d", "amazon-in", "bing", "wikipedia-bn" - ] - } - }, - "bn-BD": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "wikipedia-bn" -+ "ddg", "google-b-d", "bing", "wikipedia-bn" - ] - } - }, - "bn-IN": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-in", "bing", "ddg", "wikipedia-bn" -+ "ddg", "google-b-d", "amazon-in", "bing", "wikipedia-bn" - ] - } - }, - "br": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-france", "ddg", "ebay-fr", "freelang", "wikipedia-br" -+ "ddg", "google-b-d", "amazon-france", "ebay-fr", "freelang", "wikipedia-br" - ] - } - }, - "bs": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ddg", "olx", "twitter", "wikipedia-bs" -+ "ddg", "google-b-d", "olx", "twitter", "wikipedia-bs" - ] - } - }, - "ca": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "diec2", "ddg", "ebay-es", "twitter", "wikipedia-ca" -+ "ddg", "google-b-d", "bing", "diec2", "ebay-es", "twitter", "wikipedia-ca" - ] - } - }, - "cak": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-es" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-es" - ] - } - }, - "crh": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ddg", "twitter", "wikipedia-crh" -+ "ddg", "google-b-d", "twitter", "wikipedia-crh" - ] - } - }, -@@ -222,74 +222,74 @@ - "default": { - "searchOrder": ["Google", "Seznam"], - "visibleDefaultEngines": [ -- "google-b-d", "seznam-cz", "ddg", "heureka-cz", "mapy-cz", "wikipedia-cz" -+ "ddg", "google-b-d", "seznam-cz", "heureka-cz", "mapy-cz", "wikipedia-cz" - ] - } - }, - "cy": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-en-GB", "ddg", "ebay-uk", "palasprint", "wikipedia-cy" -+ "ddg", "google-b-d", "amazon-en-GB", "ebay-uk", "palasprint", "wikipedia-cy" - ] - } - }, - "da": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-en-GB", "ddg", "wikipedia-da" -+ "ddg", "google-b-d", "bing", "amazon-en-GB", "wikipedia-da" - ] - } - }, - "de": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-de", "bing", "ddg", "ebay-de", "ecosia", "leo_ende_de", "wikipedia-de" -+ "ddg", "google-b-d", "amazon-de", "bing", "ebay-de", "ecosia", "leo_ende_de", "wikipedia-de" - ] - } - }, - "dsb": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-dsb" -+ "ddg", "google-b-d", "bing", "amazon-de", "ebay-de", "leo_ende_de", "wikipedia-dsb" - ] - } - }, - "el": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-en-GB", "bing", "ddg", "wikipedia-el" -+ "ddg", "google-b-d", "amazon-en-GB", "bing", "wikipedia-el" - ] - } - }, - "en-CA": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" -+ "ddg", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" - ] - }, - "KZ": { - "visibleDefaultEngines": [ -- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" -+ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "BY": { - "visibleDefaultEngines": [ -- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" -+ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "RU": { - "visibleDefaultEngines": [ -- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" -+ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "TR": { - "visibleDefaultEngines": [ -- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" -+ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "experimental-hidden": { - "visibleDefaultEngines": [ -@@ -300,32 +300,32 @@ - "en-GB": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" -+ "ddg", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" - ] - }, - "KZ": { - "visibleDefaultEngines": [ -- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" -+ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "BY": { - "visibleDefaultEngines": [ -- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" -+ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "RU": { - "visibleDefaultEngines": [ -- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" -+ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "TR": { - "visibleDefaultEngines": [ -- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" -+ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "experimental-hidden": { - "visibleDefaultEngines": [ -@@ -336,66 +336,66 @@ - "en-ZA": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" -+ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" - ] - }, - "KZ": { - "visibleDefaultEngines": [ -- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" -+ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "BY": { - "visibleDefaultEngines": [ -- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" -+ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "RU": { - "visibleDefaultEngines": [ -- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" -+ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "TR": { - "visibleDefaultEngines": [ -- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" -+ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - } - }, - "eo": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-eo" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-eo" - ] - } - }, - "es-AR": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazondotcom", "drae", "ddg", "mercadolibre-ar", "wikipedia-es" -+ "ddg", "google-b-d", "amazondotcom", "drae", "mercadolibre-ar", "wikipedia-es" - ] - } - }, - "es-CL": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "drae", "ddg", "mercadolibre-cl", "wikipedia-es" -+ "ddg", "google-b-d", "bing", "drae", "mercadolibre-cl", "wikipedia-es" - ] - } - }, - "es-ES": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "drae", "ddg", "ebay-es", "twitter", "wikipedia-es" -+ "ddg", "google-b-d", "bing", "drae", "ebay-es", "twitter", "wikipedia-es" - ] - } - }, - "es-MX": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "mercadolibre-mx", "wikipedia-es" -+ "ddg", "google-b-d", "bing", "mercadolibre-mx", "wikipedia-es" - ] - }, - "experimental-hidden": { -@@ -407,49 +407,49 @@ - "et": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "neti-ee", "ddg", "osta-ee", "wikipedia-et", "eki-ee" -+ "ddg", "google-b-d", "neti-ee", "osta-ee", "wikipedia-et", "eki-ee" - ] - } - }, - "eu": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-eu" -+ "ddg", "google-b-d", "bing", "amazon-en-GB", "ebay-es", "wikipedia-eu" - ] - } - }, - "fa": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazondotcom", "bing", "ddg", "wikipedia-fa" -+ "ddg", "google-b-d", "amazondotcom", "bing", "wikipedia-fa" - ] - } - }, - "ff": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-france", "ddg", "wikipedia-fr" -+ "ddg", "google-b-d", "bing", "amazon-france", "wikipedia-fr" - ] - } - }, - "fi": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "wikipedia-fi" -+ "ddg", "google-b-d", "bing", "wikipedia-fi" - ] - } - }, - "fr": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-france", "ddg", "ebay-fr", "qwant", "wikipedia-fr" -+ "ddg", "google-b-d", "bing", "amazon-france", "ebay-fr", "qwant", "wikipedia-fr" - ] - } - }, - "fy-NL": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "bolcom-fy-NL", "ddg", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL" -+ "ddg", "google-b-d", "bing", "bolcom-fy-NL", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL" - ] - }, - "experimental-hidden": { -@@ -461,105 +461,105 @@ - "ga-IE": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-en-GB", "ddg", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE" -+ "ddg", "google-b-d", "amazon-en-GB", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE" - ] - } - }, - "gd": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-en-GB", "bbc-alba", "ddg", "ebay-uk", "faclair-beag", "wikipedia-gd" -+ "ddg", "google-b-d", "amazon-en-GB", "bbc-alba", "ebay-uk", "faclair-beag", "wikipedia-gd" - ] - } - }, - "gl": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-gl" -+ "ddg", "google-b-d", "amazon-en-GB", "ebay-es", "wikipedia-gl" - ] - } - }, - "gn": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-gn" -+ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-gn" - ] - } - }, - "gu-IN": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia-gu" -+ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia-gu" - ] - } - }, - "he": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ddg", "wikipedia-he", "morfix-dic" -+ "ddg", "google-b-d", "wikipedia-he", "morfix-dic" - ] - } - }, - "hi-IN": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "wikipedia-hi" -+ "ddg", "google-b-d", "bing", "wikipedia-hi" - ] - } - }, - "hr": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-en-GB", "bing", "ddg", "eudict", "twitter", "wikipedia-hr" -+ "ddg", "google-b-d", "amazon-en-GB", "bing", "eudict", "twitter", "wikipedia-hr" - ] - } - }, - "hsb": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-hsb" -+ "ddg", "google-b-d", "bing", "amazon-de", "ebay-de", "leo_ende_de", "wikipedia-hsb" - ] - } - }, - "hu": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ddg", "vatera", "wikipedia-hu" -+ "ddg", "google-b-d", "vatera", "wikipedia-hu" - ] - } - }, - "hy-AM": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazondotcom", "ddg", "list-am", "wikipedia-hy" -+ "ddg", "google-b-d", "amazondotcom", "list-am", "wikipedia-hy" - ] - } - }, - "ia": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ia" -+ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-ia" - ] - } - }, - "id": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ddg", "wikipedia-id" -+ "ddg", "google-b-d", "wikipedia-id" - ] - } - }, - "is": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-is" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-is" - ] - } - }, - "it": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-it", "ddg", "ebay-it", "wikipedia-it" -+ "ddg", "google-b-d", "bing", "amazon-it", "ebay-it", "wikipedia-it" - ] - } - }, -@@ -567,7 +567,7 @@ - "default": { - "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて！goo", "Twitter", "Wikipedia (ja)"], - "visibleDefaultEngines": [ -- "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg" -+ "ddg", "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja" - ] - } - }, -@@ -575,159 +575,159 @@ - "default": { - "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて！goo", "Twitter", "Wikipedia (ja)"], - "visibleDefaultEngines": [ -- "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg" -+ "ddg", "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja" - ] - } - }, - "ka": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ka" -+ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-ka" - ] - } - }, - "kab": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "wikipedia-kab" -+ "ddg", "google-b-d", "bing", "wikipedia-kab" - ] - } - }, - "kk": { - "default": { - "visibleDefaultEngines": [ -- "yandex-kk", "google-b-d", "ddg", "flip", "twitter", "wikipedia-kk" -+ "ddg", "yandex-kk", "google-b-d", "flip", "twitter", "wikipedia-kk" - ] - }, - "KZ": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - }, - "BY": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - }, - "RU": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - }, - "TR": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - } - }, - "km": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-km" -+ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-km" - ] - } - }, - "kn": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-in", "ddg", "kannadastore", "wikipedia-kn" -+ "ddg", "google-b-d", "bing", "amazon-in", "kannadastore", "wikipedia-kn" - ] - } - }, - "ko": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ddg", "naver-kr", "daum-kr", "wikipedia-kr" -+ "ddg", "google-b-d", "naver-kr", "daum-kr", "wikipedia-kr" - ] - } - }, - "lij": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-it", "ddg", "ebay-it", "wikipedia-lij" -+ "ddg", "google-b-d", "bing", "amazon-it", "ebay-it", "wikipedia-lij" - ] - } - }, - "lo": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "wikipedia-lo", "twitter" -+ "ddg", "google-b-d", "bing", "wikipedia-lo", "twitter" - ] - } - }, - "lt": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "wikipedia-lt", "bing", "amazondotcom", "ddg", "twitter" -+ "ddg", "google-b-d", "wikipedia-lt", "bing", "amazondotcom", "twitter" - ] - } - }, - "ltg": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ddg", "salidzinilv", "sslv", "wikipedia-ltg" -+ "ddg", "google-b-d", "salidzinilv", "sslv", "wikipedia-ltg" - ] - } - }, - "lv": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ddg", "salidzinilv", "sslv", "wikipedia-lv" -+ "ddg", "google-b-d", "salidzinilv", "sslv", "wikipedia-lv" - ] - } - }, - "mai": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-in", "ddg", "twitter", "wikipedia-hi" -+ "ddg", "google-b-d", "bing", "amazon-in", "twitter", "wikipedia-hi" - ] - } - }, - "mk": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-mk" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-mk" - ] - } - }, - "ml": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia", "wikipedia-ml" -+ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia", "wikipedia-ml" - ] - } - }, - "mr": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-in", "ddg", "wikipedia-mr" -+ "ddg", "google-b-d", "amazon-in", "wikipedia-mr" - ] - } - }, - "ms": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ms" -+ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-ms" - ] - } - }, - "my": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-my" -+ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-my" - ] - } - }, - "nb-NO": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-en-GB", "bing", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO" -+ "ddg", "google-b-d", "amazon-en-GB", "bing", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO" - ] - } - }, - "ne-NP": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "twitter", "wikipedia-ne" -+ "ddg", "google-b-d", "bing", "twitter", "wikipedia-ne" - ] - } - }, - "nl": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "bolcom-nl", "ddg", "ebay-nl", "marktplaats-nl", "wikipedia-nl" -+ "ddg", "google-b-d", "bing", "bolcom-nl", "ebay-nl", "marktplaats-nl", "wikipedia-nl" - ] - }, - "experimental-hidden": { -@@ -739,244 +739,244 @@ - "nn-NO": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-en-GB", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NN" -+ "ddg", "google-b-d", "bing", "amazon-en-GB", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NN" - ] - } - }, - "oc": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "twitter", "wikipedia-oc", "wiktionary-oc" -+ "ddg", "google-b-d", "bing", "twitter", "wikipedia-oc", "wiktionary-oc" - ] - } - }, - "or": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia-or" -+ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia-or" - ] - } - }, - "pa-IN": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia-pa" -+ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia-pa" - ] - } - }, - "pl": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "allegro-pl", "ddg", "pwn-pl", "wikipedia-pl", "wolnelektury-pl" -+ "ddg", "google-b-d", "allegro-pl", "pwn-pl", "wikipedia-pl", "wolnelektury-pl" - ] - } - }, - "pt-BR": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "mercadolivre", "twitter", "wikipedia-pt" -+ "ddg", "google-b-d", "bing", "mercadolivre", "twitter", "wikipedia-pt" - ] - } - }, - "pt-PT": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-en-GB", "ddg", "priberam", "wikipedia-pt" -+ "ddg", "google-b-d", "amazon-en-GB", "priberam", "wikipedia-pt" - ] - } - }, - "rm": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "ebay-ch", "leo_ende_de", "wikipedia-rm" -+ "ddg", "google-b-d", "bing", "ebay-ch", "leo_ende_de", "wikipedia-rm" - ] - } - }, - "ro": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ro" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-ro" - ] - } - }, - "ru": { - "default": { - "visibleDefaultEngines": [ -- "yandex-ru", "google-b-d", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru" -+ "ddg", "yandex-ru", "google-b-d", "ozonru", "priceru", "wikipedia-ru", "mailru" - ] - }, - "RU": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - }, - "BY": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - }, - "KZ": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - }, - "TR": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - } - }, - "si": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazondotcom", "ddg", "wikipedia-si" -+ "ddg", "google-b-d", "amazondotcom", "wikipedia-si" - ] - } - }, - "sk": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "azet-sk", "atlas-sk", "ddg", "wikipedia-sk", "zoznam-sk" -+ "ddg", "google-b-d", "azet-sk", "atlas-sk", "wikipedia-sk", "zoznam-sk" - ] - } - }, - "sl": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ceneji", "ddg", "najdi-si", "odpiralni", "twitter", "wikipedia-sl" -+ "ddg", "google-b-d", "ceneji", "najdi-si", "odpiralni", "twitter", "wikipedia-sl" - ] - } - }, - "son": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-france", "ddg", "wikipedia-fr" -+ "ddg", "google-b-d", "bing", "amazon-france", "wikipedia-fr" - ] - } - }, - "sq": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-en-GB", "ddg", "wikipedia-sq" -+ "ddg", "google-b-d", "bing", "amazon-en-GB", "wikipedia-sq" - ] - } - }, - "sr": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-en-GB", "bing", "ddg", "wikipedia-sr", "pogodak" -+ "ddg", "google-b-d", "amazon-en-GB", "bing", "wikipedia-sr", "pogodak" - ] - } - }, - "sv-SE": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "allaannonser-sv-SE", "ddg", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE" -+ "ddg", "google-b-d", "bing", "allaannonser-sv-SE", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE" - ] - } - }, - "ta": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-in", "ddg", "wikipedia-ta" -+ "ddg", "google-b-d", "amazon-in", "wikipedia-ta" - ] - } - }, - "te": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-in", "ddg", "wikipedia-te", "wiktionary-te" -+ "ddg", "google-b-d", "amazon-in", "wikipedia-te", "wiktionary-te" - ] - } - }, - "th": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazondotcom", "bing", "ddg", "longdo", "wikipedia-th" -+ "ddg", "google-b-d", "amazondotcom", "bing", "longdo", "wikipedia-th" - ] - } - }, - "tl": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-tl" -+ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-tl" - ] - } - }, - "tr": { - "default": { - "visibleDefaultEngines": [ -- "yandex-tr", "google-b-d", "ddg", "twitter", "wikipedia-tr" -+ "ddg", "yandex-tr", "google-b-d", "twitter", "wikipedia-tr" - ] - }, - "TR": { -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "BY": { -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "KZ": { -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "RU": { -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - } - }, - "trs": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-es" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-es" - ] - } - }, - "uk": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "wikipedia-uk", "hotline-ua" -+ "ddg", "google-b-d", "bing", "wikipedia-uk", "hotline-ua" - ] - } - }, - "ur": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-in", "ddg", "twitter", "wikipedia-ur" -+ "ddg", "google-b-d", "bing", "amazon-in", "twitter", "wikipedia-ur" - ] - } - }, - "uz": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-uz" -+ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-uz" - ] - } - }, - "vi": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "coccoc", "ddg", "wikipedia-vi" -+ "ddg", "google-b-d", "coccoc", "wikipedia-vi" - ] - } - }, - "wo": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-france", "ddg", "ebay-fr", "twitter", "wikipedia-wo" -+ "ddg", "google-b-d", "bing", "amazon-france", "ebay-fr", "twitter", "wikipedia-wo" - ] - } - }, - "xh": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "wikipedia" -+ "ddg", "google-b-d", "bing", "wikipedia" - ] - } - }, - "zh-CN": { - "default": { - "visibleDefaultEngines": [ -- "baidu", "google-b-d", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn" -+ "ddg", "baidu", "google-b-d", "bing", "wikipedia-zh-CN", "amazondotcn" - ] - }, - "CN": { -- "searchDefault": "百度" -+ "searchDefault": "DuckDuckGo" - } - }, - "zh-TW": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ddg", "readmoo", "wikipedia-zh-TW" -+ "ddg", "google-b-d", "readmoo", "wikipedia-zh-TW" - ] - } - } diff --git a/gnu/packages/patches/icecat-disable-sync.patch b/gnu/packages/patches/icecat-disable-sync.patch deleted file mode 100644 index 6d4459ee31..0000000000 --- a/gnu/packages/patches/icecat-disable-sync.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/browser/app/profile/icecat.js.orig 1980-01-01 18:59:51.000000000 -0500 -+++ b/browser/app/profile/icecat.js 2019-10-25 06:24:03.065989309 -0400 -@@ -2275,3 +2275,6 @@ - pref("general.buildID.override", "Gecko/20100101"); - pref("general.oscpu.override", "Windows NT 6.1"); - pref("general.platform.override", "Win32"); -+ -+// Disable Firefox Accounts and Sign in to Sync. -+pref("identity.fxaccounts.enabled", false); diff --git a/gnu/packages/patches/icecat-gnuzilla-fixes.patch b/gnu/packages/patches/icecat-gnuzilla-fixes.patch new file mode 100644 index 0000000000..f3ceaebd03 --- /dev/null +++ b/gnu/packages/patches/icecat-gnuzilla-fixes.patch @@ -0,0 +1,1164 @@ +diff --git a/makeicecat b/makeicecat +index b04c731..8e4947c 100644 +--- a/makeicecat ++++ b/makeicecat +@@ -80,10 +80,10 @@ mv compare-locales $SOURCEDIR/l10n + + cd $SOURCEDIR + +-#for patch in $DATA/patches/*; do +-# echo Patching with file: $patch +-# patch -p1 < $patch +-#done ++for patch in $DATA/patches/*.patch; do ++ echo Patching with file: $patch ++ patch -p1 --force --no-backup-if-mismatch --input $patch ++done + + cp $DATA/Changelog.IceCat $DATA/README.IceCat . + +diff --git a/data/settings.js b/data/settings.js +index 03af220..7b2f33a 100644 +--- a/data/settings.js ++++ b/data/settings.js +@@ -211,6 +211,9 @@ pref("toolkit.telemetry.enabled", false); + pref("media.eme.enabled", false); + pref("media.eme.apiVisible", false); + ++// Firefox Accounts ++pref("identity.fxaccounts.enabled", false); ++ + // WebRTC + pref("media.peerconnection.enabled", true); + // Don't reveal your internal IP when WebRTC is enabled +diff --git a/data/patches/default-search-duckduckgo.patch b/data/patches/default-search-duckduckgo.patch +new file mode 100644 +index 0000000..9eea07b +--- /dev/null ++++ b/data/patches/default-search-duckduckgo.patch +@@ -0,0 +1,1108 @@ ++--- a/browser/components/search/SearchTelemetry.jsm.orig 1980-01-01 18:59:51.000000000 -0500 +++++ b/browser/components/search/SearchTelemetry.jsm 2019-10-25 06:58:49.564335696 -0400 ++@@ -40,6 +40,12 @@ ++ * page mightbe an advert. ++ */ ++ const SEARCH_PROVIDER_INFO = { +++ duckduckgo: { +++ regexp: /^https:\/\/duckduckgo\.com\//, +++ queryParam: "q", +++ codeParam: "t", +++ codePrefixes: ["ff"], +++ }, ++ google: { ++ regexp: /^https:\/\/www\.google\.(?:.+)\/search/, ++ queryParam: "q", ++@@ -50,12 +56,6 @@ ++ /^https:\/\/www\.googleadservices\.com\/(?:pagead\/)?aclk/, ++ ], ++ }, ++- duckduckgo: { ++- regexp: /^https:\/\/duckduckgo\.com\//, ++- queryParam: "q", ++- codeParam: "t", ++- codePrefixes: ["ff"], ++- }, ++ yahoo: { ++ regexp: /^https:\/\/(?:.*)search\.yahoo\.com\/search/, ++ queryParam: "p", ++--- a/browser/components/search/extensions/list.json.orig 1980-01-01 18:59:51.000000000 -0500 +++++ b/browser/components/search/extensions/list.json 2019-10-25 07:27:58.209006756 -0400 ++@@ -1,9 +1,9 @@ ++ { ++ "default": { ++- "searchDefault": "Google", ++- "searchOrder": ["Google", "Bing"], +++ "searchDefault": "DuckDuckGo", +++ "searchOrder": ["DuckDuckGo", "Google", "Bing"], ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia" +++ "ddg", "google-b-d", "amazondotcom", "bing", "ebay", "twitter", "wikipedia" ++ ] ++ }, ++ "regionOverrides": { ++@@ -54,32 +54,32 @@ ++ "en-US": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia" +++ "ddg", "google-b-d", "amazondotcom", "bing", "ebay", "twitter", "wikipedia" ++ ] ++ }, ++ "KZ": { ++ "visibleDefaultEngines": [ ++- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" +++ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en" ++ ], ++- "searchDefault": "Yandex" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "BY": { ++ "visibleDefaultEngines": [ ++- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" +++ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en" ++ ], ++- "searchDefault": "Yandex" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "RU": { ++ "visibleDefaultEngines": [ ++- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" +++ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en" ++ ], ++- "searchDefault": "Yandex" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "TR": { ++ "visibleDefaultEngines": [ ++- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" +++ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en" ++ ], ++- "searchDefault": "Yandex" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "experimental-hidden": { ++ "visibleDefaultEngines": [ ++@@ -90,131 +90,131 @@ ++ "ach": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" +++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" ++ ] ++ } ++ }, ++ "af": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-af" +++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-af" ++ ] ++ } ++ }, ++ "an": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "ebay-es", "wikipedia-an", "ddg", "twitter" +++ "ddg", "google-b-d", "bing", "ebay-es", "wikipedia-an", "twitter" ++ ] ++ } ++ }, ++ "ar": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ar" +++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-ar" ++ ] ++ } ++ }, ++ "as": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazon-in", "ddg", "wikipedia-as" +++ "ddg", "google-b-d", "amazon-in", "wikipedia-as" ++ ] ++ } ++ }, ++ "ast": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "ddg", "ebay-es", "wikipedia-ast" +++ "ddg", "google-b-d", "bing", "ebay-es", "wikipedia-ast" ++ ] ++ } ++ }, ++ "az": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazondotcom", "azerdict", "bing", "ddg", "wikipedia-az", "yandex-az" +++ "ddg", "google-b-d", "amazondotcom", "azerdict", "bing", "wikipedia-az", "yandex-az" ++ ] ++ } ++ }, ++ "be": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "yandex-by", "google-b-d", "ddg", "wikipedia-be", "wikipedia-be-tarask" +++ "ddg", "yandex-by", "google-b-d", "wikipedia-be", "wikipedia-be-tarask" ++ ] ++ }, ++ "BY": { ++- "searchDefault": "Яндекс" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "KZ": { ++- "searchDefault": "Яндекс" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "RU": { ++- "searchDefault": "Яндекс" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "TR": { ++- "searchDefault": "Яндекс" +++ "searchDefault": "DuckDuckGo" ++ } ++ }, ++ "bg": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazondotcom", "ddg", "pazaruvaj", "wikipedia-bg" +++ "ddg", "google-b-d", "amazondotcom", "pazaruvaj", "wikipedia-bg" ++ ] ++ } ++ }, ++ "bn": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazon-in", "bing", "ddg", "wikipedia-bn" +++ "ddg", "google-b-d", "amazon-in", "bing", "wikipedia-bn" ++ ] ++ } ++ }, ++ "bn-BD": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "ddg", "wikipedia-bn" +++ "ddg", "google-b-d", "bing", "wikipedia-bn" ++ ] ++ } ++ }, ++ "bn-IN": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazon-in", "bing", "ddg", "wikipedia-bn" +++ "ddg", "google-b-d", "amazon-in", "bing", "wikipedia-bn" ++ ] ++ } ++ }, ++ "br": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazon-france", "ddg", "ebay-fr", "freelang", "wikipedia-br" +++ "ddg", "google-b-d", "amazon-france", "ebay-fr", "freelang", "wikipedia-br" ++ ] ++ } ++ }, ++ "bs": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "ddg", "olx", "twitter", "wikipedia-bs" +++ "ddg", "google-b-d", "olx", "twitter", "wikipedia-bs" ++ ] ++ } ++ }, ++ "ca": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "diec2", "ddg", "ebay-es", "twitter", "wikipedia-ca" +++ "ddg", "google-b-d", "bing", "diec2", "ebay-es", "twitter", "wikipedia-ca" ++ ] ++ } ++ }, ++ "cak": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-es" +++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-es" ++ ] ++ } ++ }, ++ "crh": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "ddg", "twitter", "wikipedia-crh" +++ "ddg", "google-b-d", "twitter", "wikipedia-crh" ++ ] ++ } ++ }, ++@@ -222,74 +222,74 @@ ++ "default": { ++ "searchOrder": ["Google", "Seznam"], ++ "visibleDefaultEngines": [ ++- "google-b-d", "seznam-cz", "ddg", "heureka-cz", "mapy-cz", "wikipedia-cz" +++ "ddg", "google-b-d", "seznam-cz", "heureka-cz", "mapy-cz", "wikipedia-cz" ++ ] ++ } ++ }, ++ "cy": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazon-en-GB", "ddg", "ebay-uk", "palasprint", "wikipedia-cy" +++ "ddg", "google-b-d", "amazon-en-GB", "ebay-uk", "palasprint", "wikipedia-cy" ++ ] ++ } ++ }, ++ "da": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazon-en-GB", "ddg", "wikipedia-da" +++ "ddg", "google-b-d", "bing", "amazon-en-GB", "wikipedia-da" ++ ] ++ } ++ }, ++ "de": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazon-de", "bing", "ddg", "ebay-de", "ecosia", "leo_ende_de", "wikipedia-de" +++ "ddg", "google-b-d", "amazon-de", "bing", "ebay-de", "ecosia", "leo_ende_de", "wikipedia-de" ++ ] ++ } ++ }, ++ "dsb": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazon-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-dsb" +++ "ddg", "google-b-d", "bing", "amazon-de", "ebay-de", "leo_ende_de", "wikipedia-dsb" ++ ] ++ } ++ }, ++ "el": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazon-en-GB", "bing", "ddg", "wikipedia-el" +++ "ddg", "google-b-d", "amazon-en-GB", "bing", "wikipedia-el" ++ ] ++ } ++ }, ++ "en-CA": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" +++ "ddg", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" ++ ] ++ }, ++ "KZ": { ++ "visibleDefaultEngines": [ ++- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" +++ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" ++ ], ++- "searchDefault": "Yandex" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "BY": { ++ "visibleDefaultEngines": [ ++- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" +++ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" ++ ], ++- "searchDefault": "Yandex" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "RU": { ++ "visibleDefaultEngines": [ ++- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" +++ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" ++ ], ++- "searchDefault": "Yandex" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "TR": { ++ "visibleDefaultEngines": [ ++- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" +++ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" ++ ], ++- "searchDefault": "Yandex" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "experimental-hidden": { ++ "visibleDefaultEngines": [ ++@@ -300,32 +300,32 @@ ++ "en-GB": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" +++ "ddg", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" ++ ] ++ }, ++ "KZ": { ++ "visibleDefaultEngines": [ ++- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" +++ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" ++ ], ++- "searchDefault": "Yandex" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "BY": { ++ "visibleDefaultEngines": [ ++- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" +++ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" ++ ], ++- "searchDefault": "Yandex" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "RU": { ++ "visibleDefaultEngines": [ ++- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" +++ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" ++ ], ++- "searchDefault": "Yandex" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "TR": { ++ "visibleDefaultEngines": [ ++- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" +++ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" ++ ], ++- "searchDefault": "Yandex" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "experimental-hidden": { ++ "visibleDefaultEngines": [ ++@@ -336,66 +336,66 @@ ++ "en-ZA": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" +++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" ++ ] ++ }, ++ "KZ": { ++ "visibleDefaultEngines": [ ++- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" +++ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" ++ ], ++- "searchDefault": "Yandex" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "BY": { ++ "visibleDefaultEngines": [ ++- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" +++ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" ++ ], ++- "searchDefault": "Yandex" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "RU": { ++ "visibleDefaultEngines": [ ++- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" +++ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" ++ ], ++- "searchDefault": "Yandex" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "TR": { ++ "visibleDefaultEngines": [ ++- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" +++ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" ++ ], ++- "searchDefault": "Yandex" +++ "searchDefault": "DuckDuckGo" ++ } ++ }, ++ "eo": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-eo" +++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-eo" ++ ] ++ } ++ }, ++ "es-AR": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazondotcom", "drae", "ddg", "mercadolibre-ar", "wikipedia-es" +++ "ddg", "google-b-d", "amazondotcom", "drae", "mercadolibre-ar", "wikipedia-es" ++ ] ++ } ++ }, ++ "es-CL": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "drae", "ddg", "mercadolibre-cl", "wikipedia-es" +++ "ddg", "google-b-d", "bing", "drae", "mercadolibre-cl", "wikipedia-es" ++ ] ++ } ++ }, ++ "es-ES": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "drae", "ddg", "ebay-es", "twitter", "wikipedia-es" +++ "ddg", "google-b-d", "bing", "drae", "ebay-es", "twitter", "wikipedia-es" ++ ] ++ } ++ }, ++ "es-MX": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "ddg", "mercadolibre-mx", "wikipedia-es" +++ "ddg", "google-b-d", "bing", "mercadolibre-mx", "wikipedia-es" ++ ] ++ }, ++ "experimental-hidden": { ++@@ -407,49 +407,49 @@ ++ "et": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "neti-ee", "ddg", "osta-ee", "wikipedia-et", "eki-ee" +++ "ddg", "google-b-d", "neti-ee", "osta-ee", "wikipedia-et", "eki-ee" ++ ] ++ } ++ }, ++ "eu": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-eu" +++ "ddg", "google-b-d", "bing", "amazon-en-GB", "ebay-es", "wikipedia-eu" ++ ] ++ } ++ }, ++ "fa": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazondotcom", "bing", "ddg", "wikipedia-fa" +++ "ddg", "google-b-d", "amazondotcom", "bing", "wikipedia-fa" ++ ] ++ } ++ }, ++ "ff": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazon-france", "ddg", "wikipedia-fr" +++ "ddg", "google-b-d", "bing", "amazon-france", "wikipedia-fr" ++ ] ++ } ++ }, ++ "fi": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "ddg", "wikipedia-fi" +++ "ddg", "google-b-d", "bing", "wikipedia-fi" ++ ] ++ } ++ }, ++ "fr": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazon-france", "ddg", "ebay-fr", "qwant", "wikipedia-fr" +++ "ddg", "google-b-d", "bing", "amazon-france", "ebay-fr", "qwant", "wikipedia-fr" ++ ] ++ } ++ }, ++ "fy-NL": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "bolcom-fy-NL", "ddg", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL" +++ "ddg", "google-b-d", "bing", "bolcom-fy-NL", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL" ++ ] ++ }, ++ "experimental-hidden": { ++@@ -461,105 +461,105 @@ ++ "ga-IE": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazon-en-GB", "ddg", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE" +++ "ddg", "google-b-d", "amazon-en-GB", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE" ++ ] ++ } ++ }, ++ "gd": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazon-en-GB", "bbc-alba", "ddg", "ebay-uk", "faclair-beag", "wikipedia-gd" +++ "ddg", "google-b-d", "amazon-en-GB", "bbc-alba", "ebay-uk", "faclair-beag", "wikipedia-gd" ++ ] ++ } ++ }, ++ "gl": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-gl" +++ "ddg", "google-b-d", "amazon-en-GB", "ebay-es", "wikipedia-gl" ++ ] ++ } ++ }, ++ "gn": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-gn" +++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-gn" ++ ] ++ } ++ }, ++ "gu-IN": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia-gu" +++ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia-gu" ++ ] ++ } ++ }, ++ "he": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "ddg", "wikipedia-he", "morfix-dic" +++ "ddg", "google-b-d", "wikipedia-he", "morfix-dic" ++ ] ++ } ++ }, ++ "hi-IN": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "ddg", "wikipedia-hi" +++ "ddg", "google-b-d", "bing", "wikipedia-hi" ++ ] ++ } ++ }, ++ "hr": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazon-en-GB", "bing", "ddg", "eudict", "twitter", "wikipedia-hr" +++ "ddg", "google-b-d", "amazon-en-GB", "bing", "eudict", "twitter", "wikipedia-hr" ++ ] ++ } ++ }, ++ "hsb": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazon-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-hsb" +++ "ddg", "google-b-d", "bing", "amazon-de", "ebay-de", "leo_ende_de", "wikipedia-hsb" ++ ] ++ } ++ }, ++ "hu": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "ddg", "vatera", "wikipedia-hu" +++ "ddg", "google-b-d", "vatera", "wikipedia-hu" ++ ] ++ } ++ }, ++ "hy-AM": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazondotcom", "ddg", "list-am", "wikipedia-hy" +++ "ddg", "google-b-d", "amazondotcom", "list-am", "wikipedia-hy" ++ ] ++ } ++ }, ++ "ia": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ia" +++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-ia" ++ ] ++ } ++ }, ++ "id": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "ddg", "wikipedia-id" +++ "ddg", "google-b-d", "wikipedia-id" ++ ] ++ } ++ }, ++ "is": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-is" +++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-is" ++ ] ++ } ++ }, ++ "it": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazon-it", "ddg", "ebay-it", "wikipedia-it" +++ "ddg", "google-b-d", "bing", "amazon-it", "ebay-it", "wikipedia-it" ++ ] ++ } ++ }, ++@@ -567,7 +567,7 @@ ++ "default": { ++ "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて！goo", "Twitter", "Wikipedia (ja)"], ++ "visibleDefaultEngines": [ ++- "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg" +++ "ddg", "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja" ++ ] ++ } ++ }, ++@@ -575,159 +575,159 @@ ++ "default": { ++ "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて！goo", "Twitter", "Wikipedia (ja)"], ++ "visibleDefaultEngines": [ ++- "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg" +++ "ddg", "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja" ++ ] ++ } ++ }, ++ "ka": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ka" +++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-ka" ++ ] ++ } ++ }, ++ "kab": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "ddg", "wikipedia-kab" +++ "ddg", "google-b-d", "bing", "wikipedia-kab" ++ ] ++ } ++ }, ++ "kk": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "yandex-kk", "google-b-d", "ddg", "flip", "twitter", "wikipedia-kk" +++ "ddg", "yandex-kk", "google-b-d", "flip", "twitter", "wikipedia-kk" ++ ] ++ }, ++ "KZ": { ++- "searchDefault": "Яндекс" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "BY": { ++- "searchDefault": "Яндекс" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "RU": { ++- "searchDefault": "Яндекс" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "TR": { ++- "searchDefault": "Яндекс" +++ "searchDefault": "DuckDuckGo" ++ } ++ }, ++ "km": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-km" +++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-km" ++ ] ++ } ++ }, ++ "kn": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazon-in", "ddg", "kannadastore", "wikipedia-kn" +++ "ddg", "google-b-d", "bing", "amazon-in", "kannadastore", "wikipedia-kn" ++ ] ++ } ++ }, ++ "ko": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "ddg", "naver-kr", "daum-kr", "wikipedia-kr" +++ "ddg", "google-b-d", "naver-kr", "daum-kr", "wikipedia-kr" ++ ] ++ } ++ }, ++ "lij": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazon-it", "ddg", "ebay-it", "wikipedia-lij" +++ "ddg", "google-b-d", "bing", "amazon-it", "ebay-it", "wikipedia-lij" ++ ] ++ } ++ }, ++ "lo": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "ddg", "wikipedia-lo", "twitter" +++ "ddg", "google-b-d", "bing", "wikipedia-lo", "twitter" ++ ] ++ } ++ }, ++ "lt": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "wikipedia-lt", "bing", "amazondotcom", "ddg", "twitter" +++ "ddg", "google-b-d", "wikipedia-lt", "bing", "amazondotcom", "twitter" ++ ] ++ } ++ }, ++ "ltg": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "ddg", "salidzinilv", "sslv", "wikipedia-ltg" +++ "ddg", "google-b-d", "salidzinilv", "sslv", "wikipedia-ltg" ++ ] ++ } ++ }, ++ "lv": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "ddg", "salidzinilv", "sslv", "wikipedia-lv" +++ "ddg", "google-b-d", "salidzinilv", "sslv", "wikipedia-lv" ++ ] ++ } ++ }, ++ "mai": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazon-in", "ddg", "twitter", "wikipedia-hi" +++ "ddg", "google-b-d", "bing", "amazon-in", "twitter", "wikipedia-hi" ++ ] ++ } ++ }, ++ "mk": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-mk" +++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-mk" ++ ] ++ } ++ }, ++ "ml": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia", "wikipedia-ml" +++ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia", "wikipedia-ml" ++ ] ++ } ++ }, ++ "mr": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazon-in", "ddg", "wikipedia-mr" +++ "ddg", "google-b-d", "amazon-in", "wikipedia-mr" ++ ] ++ } ++ }, ++ "ms": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ms" +++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-ms" ++ ] ++ } ++ }, ++ "my": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-my" +++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-my" ++ ] ++ } ++ }, ++ "nb-NO": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazon-en-GB", "bing", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO" +++ "ddg", "google-b-d", "amazon-en-GB", "bing", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO" ++ ] ++ } ++ }, ++ "ne-NP": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "ddg", "twitter", "wikipedia-ne" +++ "ddg", "google-b-d", "bing", "twitter", "wikipedia-ne" ++ ] ++ } ++ }, ++ "nl": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "bolcom-nl", "ddg", "ebay-nl", "marktplaats-nl", "wikipedia-nl" +++ "ddg", "google-b-d", "bing", "bolcom-nl", "ebay-nl", "marktplaats-nl", "wikipedia-nl" ++ ] ++ }, ++ "experimental-hidden": { ++@@ -739,244 +739,244 @@ ++ "nn-NO": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazon-en-GB", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NN" +++ "ddg", "google-b-d", "bing", "amazon-en-GB", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NN" ++ ] ++ } ++ }, ++ "oc": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "ddg", "twitter", "wikipedia-oc", "wiktionary-oc" +++ "ddg", "google-b-d", "bing", "twitter", "wikipedia-oc", "wiktionary-oc" ++ ] ++ } ++ }, ++ "or": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia-or" +++ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia-or" ++ ] ++ } ++ }, ++ "pa-IN": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia-pa" +++ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia-pa" ++ ] ++ } ++ }, ++ "pl": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "allegro-pl", "ddg", "pwn-pl", "wikipedia-pl", "wolnelektury-pl" +++ "ddg", "google-b-d", "allegro-pl", "pwn-pl", "wikipedia-pl", "wolnelektury-pl" ++ ] ++ } ++ }, ++ "pt-BR": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "ddg", "mercadolivre", "twitter", "wikipedia-pt" +++ "ddg", "google-b-d", "bing", "mercadolivre", "twitter", "wikipedia-pt" ++ ] ++ } ++ }, ++ "pt-PT": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazon-en-GB", "ddg", "priberam", "wikipedia-pt" +++ "ddg", "google-b-d", "amazon-en-GB", "priberam", "wikipedia-pt" ++ ] ++ } ++ }, ++ "rm": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "ddg", "ebay-ch", "leo_ende_de", "wikipedia-rm" +++ "ddg", "google-b-d", "bing", "ebay-ch", "leo_ende_de", "wikipedia-rm" ++ ] ++ } ++ }, ++ "ro": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ro" +++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-ro" ++ ] ++ } ++ }, ++ "ru": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "yandex-ru", "google-b-d", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru" +++ "ddg", "yandex-ru", "google-b-d", "ozonru", "priceru", "wikipedia-ru", "mailru" ++ ] ++ }, ++ "RU": { ++- "searchDefault": "Яндекс" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "BY": { ++- "searchDefault": "Яндекс" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "KZ": { ++- "searchDefault": "Яндекс" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "TR": { ++- "searchDefault": "Яндекс" +++ "searchDefault": "DuckDuckGo" ++ } ++ }, ++ "si": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazondotcom", "ddg", "wikipedia-si" +++ "ddg", "google-b-d", "amazondotcom", "wikipedia-si" ++ ] ++ } ++ }, ++ "sk": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "azet-sk", "atlas-sk", "ddg", "wikipedia-sk", "zoznam-sk" +++ "ddg", "google-b-d", "azet-sk", "atlas-sk", "wikipedia-sk", "zoznam-sk" ++ ] ++ } ++ }, ++ "sl": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "ceneji", "ddg", "najdi-si", "odpiralni", "twitter", "wikipedia-sl" +++ "ddg", "google-b-d", "ceneji", "najdi-si", "odpiralni", "twitter", "wikipedia-sl" ++ ] ++ } ++ }, ++ "son": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazon-france", "ddg", "wikipedia-fr" +++ "ddg", "google-b-d", "bing", "amazon-france", "wikipedia-fr" ++ ] ++ } ++ }, ++ "sq": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazon-en-GB", "ddg", "wikipedia-sq" +++ "ddg", "google-b-d", "bing", "amazon-en-GB", "wikipedia-sq" ++ ] ++ } ++ }, ++ "sr": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazon-en-GB", "bing", "ddg", "wikipedia-sr", "pogodak" +++ "ddg", "google-b-d", "amazon-en-GB", "bing", "wikipedia-sr", "pogodak" ++ ] ++ } ++ }, ++ "sv-SE": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "allaannonser-sv-SE", "ddg", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE" +++ "ddg", "google-b-d", "bing", "allaannonser-sv-SE", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE" ++ ] ++ } ++ }, ++ "ta": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazon-in", "ddg", "wikipedia-ta" +++ "ddg", "google-b-d", "amazon-in", "wikipedia-ta" ++ ] ++ } ++ }, ++ "te": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazon-in", "ddg", "wikipedia-te", "wiktionary-te" +++ "ddg", "google-b-d", "amazon-in", "wikipedia-te", "wiktionary-te" ++ ] ++ } ++ }, ++ "th": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "amazondotcom", "bing", "ddg", "longdo", "wikipedia-th" +++ "ddg", "google-b-d", "amazondotcom", "bing", "longdo", "wikipedia-th" ++ ] ++ } ++ }, ++ "tl": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-tl" +++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-tl" ++ ] ++ } ++ }, ++ "tr": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "yandex-tr", "google-b-d", "ddg", "twitter", "wikipedia-tr" +++ "ddg", "yandex-tr", "google-b-d", "twitter", "wikipedia-tr" ++ ] ++ }, ++ "TR": { ++- "searchDefault": "Yandex" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "BY": { ++- "searchDefault": "Yandex" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "KZ": { ++- "searchDefault": "Yandex" +++ "searchDefault": "DuckDuckGo" ++ }, ++ "RU": { ++- "searchDefault": "Yandex" +++ "searchDefault": "DuckDuckGo" ++ } ++ }, ++ "trs": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-es" +++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-es" ++ ] ++ } ++ }, ++ "uk": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "ddg", "wikipedia-uk", "hotline-ua" +++ "ddg", "google-b-d", "bing", "wikipedia-uk", "hotline-ua" ++ ] ++ } ++ }, ++ "ur": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazon-in", "ddg", "twitter", "wikipedia-ur" +++ "ddg", "google-b-d", "bing", "amazon-in", "twitter", "wikipedia-ur" ++ ] ++ } ++ }, ++ "uz": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-uz" +++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-uz" ++ ] ++ } ++ }, ++ "vi": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "coccoc", "ddg", "wikipedia-vi" +++ "ddg", "google-b-d", "coccoc", "wikipedia-vi" ++ ] ++ } ++ }, ++ "wo": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "amazon-france", "ddg", "ebay-fr", "twitter", "wikipedia-wo" +++ "ddg", "google-b-d", "bing", "amazon-france", "ebay-fr", "twitter", "wikipedia-wo" ++ ] ++ } ++ }, ++ "xh": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "bing", "ddg", "wikipedia" +++ "ddg", "google-b-d", "bing", "wikipedia" ++ ] ++ } ++ }, ++ "zh-CN": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "baidu", "google-b-d", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn" +++ "ddg", "baidu", "google-b-d", "bing", "wikipedia-zh-CN", "amazondotcn" ++ ] ++ }, ++ "CN": { ++- "searchDefault": "百度" +++ "searchDefault": "DuckDuckGo" ++ } ++ }, ++ "zh-TW": { ++ "default": { ++ "visibleDefaultEngines": [ ++- "google-b-d", "ddg", "readmoo", "wikipedia-zh-TW" +++ "ddg", "google-b-d", "readmoo", "wikipedia-zh-TW" ++ ] ++ } ++ } +diff --git a/data/patches/legacy-profiles.patch b/data/patches/legacy-profiles.patch +new file mode 100644 +index 0000000..33e9e99 +--- /dev/null ++++ b/data/patches/legacy-profiles.patch +@@ -0,0 +1,11 @@ ++--- a/browser/moz.configure.orig 1980-01-01 18:59:51.000000000 -0500 +++++ b/browser/moz.configure 2019-10-26 21:58:37.719617701 -0400 ++@@ -7,7 +7,7 @@ ++ imply_option('MOZ_PLACES', True) ++ imply_option('MOZ_SERVICES_HEALTHREPORT', True) ++ imply_option('MOZ_SERVICES_SYNC', True) ++-imply_option('MOZ_DEDICATED_PROFILES', True) +++imply_option('MOZ_DEDICATED_PROFILES', False) ++ imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True) ++ ++ with only_when(target_is_linux & compile_environment): diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch index f0b36d7d52..a9920d6474 100644 --- a/gnu/packages/patches/icecat-makeicecat.patch +++ b/gnu/packages/patches/icecat-makeicecat.patch @@ -96,8 +96,8 @@ index b04c731..06d1f3f 100644 -cd $SOURCEDIR +# cd $SOURCEDIR - #for patch in $DATA/patches/*; do - # echo Patching with file: $patch + for patch in $DATA/patches/*.patch; do + echo Patching with file: $patch @@ -226,10 +226,10 @@ cp $DATA/bookmarks.html.in browser/locales/generic/profile/bookmarks.html.in find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i -- cgit v1.2.3 From 7a1b2ba54560a593eb02a3bf4d0462b66c50f2c3 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 28 Oct 2019 01:27:02 -0400 Subject: gnu: icecat: Update to 68.2.0-guix0-preview2. * gnu/packages/gnuzilla.scm (%icecat-version): Update. (%icecat-build-id): New variable. (icecat-source): Update gnuzilla repo commit and hash. (icecat)[arguments]: In the custom 'configure' phase, set the MOZ_BUILD_DATE environment variable to the value of %icecat-build-id. * gnu/packages/patches/icecat-gnuzilla-fixes.patch: Remove changes that are now in the upstream repository. Add more pending changes, including disabling the MOZ_SERVICES_HEALTHREPORT and MOZ_BLOCK_PROFILE_DOWNGRADE build flags, fixing a problem that prevented MOZ_DATA_REPORTING from being disabled, and fixes to the branding. * gnu/packages/patches/icecat-makeicecat.patch: Adapt to upstream changes, and changes in icecat-gnuzilla-fixes.patch. Remove a hunk that disabled rewrites to aboutRights.dtd in the l10n directory. --- gnu/packages/gnuzilla.scm | 8 +- gnu/packages/patches/icecat-gnuzilla-fixes.patch | 1369 ++++------------------ gnu/packages/patches/icecat-makeicecat.patch | 23 +- 3 files changed, 232 insertions(+), 1168 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 3902f490d0..16d3fe5db9 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -550,7 +550,8 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %icecat-version "68.2.0-guix0-preview1") +(define %icecat-version "68.2.0-guix0-preview2") +(define %icecat-build-id "20191028000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -576,7 +577,7 @@ from forcing GEXP-PROMISE." (upstream-icecat-base-version "68.1.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "395cc0798600cde44a30abaa3f5d08ce8b68f782") + (gnuzilla-commit "aa7ab9483a64c43e77736917dd83841ccc437300") (gnuzilla-source (origin (method git-fetch) @@ -586,7 +587,7 @@ from forcing GEXP-PROMISE." (file-name (git-file-name "gnuzilla" upstream-icecat-base-version)) (sha256 (base32 - "1ll3j2kpsfp1f9dxy67fay1cidsng02l8a3a23wdjqkxgrg1cf4g")))) + "03jygq1zna621y0ba6370cff4v2g9l57g3015y3vxbahnmzn9msa")))) (gnuzilla-fixes-patch (local-file (search-patch "icecat-gnuzilla-fixes.patch"))) @@ -1016,6 +1017,7 @@ from forcing GEXP-PROMISE." (setenv "CONFIG_SHELL" bash) (setenv "AUTOCONF" (which "autoconf")) ; must be autoconf-2.13 (setenv "CC" "gcc") ; apparently needed when Stylo is enabled + (setenv "MOZ_BUILD_DATE" ,%icecat-build-id) ; avoid timestamp (mkdir "../build") (chdir "../build") (format #t "build directory: ~s~%" (getcwd)) diff --git a/gnu/packages/patches/icecat-gnuzilla-fixes.patch b/gnu/packages/patches/icecat-gnuzilla-fixes.patch index f3ceaebd03..41f0d2e3a3 100644 --- a/gnu/packages/patches/icecat-gnuzilla-fixes.patch +++ b/gnu/packages/patches/icecat-gnuzilla-fixes.patch @@ -1,1164 +1,241 @@ +From 2676d4e1eb64e18d2e4722c0ea0babdc1f716fa4 Mon Sep 17 00:00:00 2001 +From: Mark H Weaver +Date: Mon, 28 Oct 2019 01:54:19 -0400 +Subject: [PATCH 1/4] Update to 68.2.0-gnu1. + +* makeicecat: Update to FFMINOR to 2, and update the expected +sha256sum of the firefox source tarball. +--- + makeicecat | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + diff --git a/makeicecat b/makeicecat -index b04c731..8e4947c 100644 +index 97ee473..1bcf465 100644 --- a/makeicecat +++ b/makeicecat -@@ -80,10 +80,10 @@ mv compare-locales $SOURCEDIR/l10n +@@ -21,7 +21,7 @@ + set -euxo pipefail - cd $SOURCEDIR + FFMAJOR=68 +-FFMINOR=1 ++FFMINOR=2 + FFSUB=0 + GNUVERSION=1 + FFVERSION=$FFMAJOR.$FFMINOR.$FFSUB +@@ -43,7 +43,7 @@ wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr + wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc + gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 + gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc +-echo -n f56f5fa5a4744be0b9acf259cb991254d708a50b9a0a12d1d846ffa5a6c409ac firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - ++echo -n 85f1c2eaf68ebedcbc0b78a342f6d16ef0865dedd426a1bba94b75c85f716f38 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - --#for patch in $DATA/patches/*; do --# echo Patching with file: $patch --# patch -p1 < $patch --#done -+for patch in $DATA/patches/*.patch; do -+ echo Patching with file: $patch -+ patch -p1 --force --no-backup-if-mismatch --input $patch -+done - - cp $DATA/Changelog.IceCat $DATA/README.IceCat . - -diff --git a/data/settings.js b/data/settings.js -index 03af220..7b2f33a 100644 ---- a/data/settings.js -+++ b/data/settings.js -@@ -211,6 +211,9 @@ pref("toolkit.telemetry.enabled", false); - pref("media.eme.enabled", false); - pref("media.eme.apiVisible", false); - -+// Firefox Accounts -+pref("identity.fxaccounts.enabled", false); -+ - // WebRTC - pref("media.peerconnection.enabled", true); - // Don't reveal your internal IP when WebRTC is enabled -diff --git a/data/patches/default-search-duckduckgo.patch b/data/patches/default-search-duckduckgo.patch + echo Extracting Firefox tarball + tar -xf firefox-${FFVERSION}esr.source.tar.xz +-- +2.23.0 + +From c3a7b761f11c75d3764779e731a7c7e86b072d2f Mon Sep 17 00:00:00 2001 +From: Mark H Weaver +Date: Mon, 28 Oct 2019 04:18:26 -0400 +Subject: [PATCH 2/4] Disable MOZ_SERVICES_HEALTHREPORT and MOZ_DATA_REPORTING. + +* data/patches/fix-data-reporting-check.patch: New file. +* data/patches/legacy-profiles.patch: Rename to ... +* data/patches/moz-configure-changes.patch: ... this, +and set MOZ_SERVICES_HEALTHREPORT to False. +--- + data/patches/fix-data-reporting-check.patch | 22 +++++++++++++++++++++ + data/patches/legacy-profiles.patch | 11 ----------- + data/patches/moz-configure-changes.patch | 14 +++++++++++++ + 3 files changed, 36 insertions(+), 11 deletions(-) + create mode 100644 data/patches/fix-data-reporting-check.patch + delete mode 100644 data/patches/legacy-profiles.patch + create mode 100644 data/patches/moz-configure-changes.patch + +diff --git a/data/patches/fix-data-reporting-check.patch b/data/patches/fix-data-reporting-check.patch new file mode 100644 -index 0000000..9eea07b +index 0000000..d586dc5 --- /dev/null -+++ b/data/patches/default-search-duckduckgo.patch -@@ -0,0 +1,1108 @@ -+--- a/browser/components/search/SearchTelemetry.jsm.orig 1980-01-01 18:59:51.000000000 -0500 -++++ b/browser/components/search/SearchTelemetry.jsm 2019-10-25 06:58:49.564335696 -0400 -+@@ -40,6 +40,12 @@ -+ * page mightbe an advert. -+ */ -+ const SEARCH_PROVIDER_INFO = { -++ duckduckgo: { -++ regexp: /^https:\/\/duckduckgo\.com\//, -++ queryParam: "q", -++ codeParam: "t", -++ codePrefixes: ["ff"], -++ }, -+ google: { -+ regexp: /^https:\/\/www\.google\.(?:.+)\/search/, -+ queryParam: "q", -+@@ -50,12 +56,6 @@ -+ /^https:\/\/www\.googleadservices\.com\/(?:pagead\/)?aclk/, -+ ], -+ }, -+- duckduckgo: { -+- regexp: /^https:\/\/duckduckgo\.com\//, -+- queryParam: "q", -+- codeParam: "t", -+- codePrefixes: ["ff"], -+- }, -+ yahoo: { -+ regexp: /^https:\/\/(?:.*)search\.yahoo\.com\/search/, -+ queryParam: "p", -+--- a/browser/components/search/extensions/list.json.orig 1980-01-01 18:59:51.000000000 -0500 -++++ b/browser/components/search/extensions/list.json 2019-10-25 07:27:58.209006756 -0400 -+@@ -1,9 +1,9 @@ -+ { -+ "default": { -+- "searchDefault": "Google", -+- "searchOrder": ["Google", "Bing"], -++ "searchDefault": "DuckDuckGo", -++ "searchOrder": ["DuckDuckGo", "Google", "Bing"], -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia" -++ "ddg", "google-b-d", "amazondotcom", "bing", "ebay", "twitter", "wikipedia" -+ ] -+ }, -+ "regionOverrides": { -+@@ -54,32 +54,32 @@ -+ "en-US": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia" -++ "ddg", "google-b-d", "amazondotcom", "bing", "ebay", "twitter", "wikipedia" -+ ] -+ }, -+ "KZ": { -+ "visibleDefaultEngines": [ -+- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" -++ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "BY": { -+ "visibleDefaultEngines": [ -+- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" -++ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "RU": { -+ "visibleDefaultEngines": [ -+- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" -++ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "TR": { -+ "visibleDefaultEngines": [ -+- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en" -++ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "experimental-hidden": { -+ "visibleDefaultEngines": [ -+@@ -90,131 +90,131 @@ -+ "ach": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" -++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" -+ ] -+ } -+ }, -+ "af": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-af" -++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-af" -+ ] -+ } -+ }, -+ "an": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ebay-es", "wikipedia-an", "ddg", "twitter" -++ "ddg", "google-b-d", "bing", "ebay-es", "wikipedia-an", "twitter" -+ ] -+ } -+ }, -+ "ar": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ar" -++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-ar" -+ ] -+ } -+ }, -+ "as": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-in", "ddg", "wikipedia-as" -++ "ddg", "google-b-d", "amazon-in", "wikipedia-as" -+ ] -+ } -+ }, -+ "ast": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "ebay-es", "wikipedia-ast" -++ "ddg", "google-b-d", "bing", "ebay-es", "wikipedia-ast" -+ ] -+ } -+ }, -+ "az": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazondotcom", "azerdict", "bing", "ddg", "wikipedia-az", "yandex-az" -++ "ddg", "google-b-d", "amazondotcom", "azerdict", "bing", "wikipedia-az", "yandex-az" -+ ] -+ } -+ }, -+ "be": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "yandex-by", "google-b-d", "ddg", "wikipedia-be", "wikipedia-be-tarask" -++ "ddg", "yandex-by", "google-b-d", "wikipedia-be", "wikipedia-be-tarask" -+ ] -+ }, -+ "BY": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "KZ": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "RU": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "TR": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ } -+ }, -+ "bg": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazondotcom", "ddg", "pazaruvaj", "wikipedia-bg" -++ "ddg", "google-b-d", "amazondotcom", "pazaruvaj", "wikipedia-bg" -+ ] -+ } -+ }, -+ "bn": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-in", "bing", "ddg", "wikipedia-bn" -++ "ddg", "google-b-d", "amazon-in", "bing", "wikipedia-bn" -+ ] -+ } -+ }, -+ "bn-BD": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "wikipedia-bn" -++ "ddg", "google-b-d", "bing", "wikipedia-bn" -+ ] -+ } -+ }, -+ "bn-IN": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-in", "bing", "ddg", "wikipedia-bn" -++ "ddg", "google-b-d", "amazon-in", "bing", "wikipedia-bn" -+ ] -+ } -+ }, -+ "br": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-france", "ddg", "ebay-fr", "freelang", "wikipedia-br" -++ "ddg", "google-b-d", "amazon-france", "ebay-fr", "freelang", "wikipedia-br" -+ ] -+ } -+ }, -+ "bs": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "ddg", "olx", "twitter", "wikipedia-bs" -++ "ddg", "google-b-d", "olx", "twitter", "wikipedia-bs" -+ ] -+ } -+ }, -+ "ca": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "diec2", "ddg", "ebay-es", "twitter", "wikipedia-ca" -++ "ddg", "google-b-d", "bing", "diec2", "ebay-es", "twitter", "wikipedia-ca" -+ ] -+ } -+ }, -+ "cak": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-es" -++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-es" -+ ] -+ } -+ }, -+ "crh": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "ddg", "twitter", "wikipedia-crh" -++ "ddg", "google-b-d", "twitter", "wikipedia-crh" -+ ] -+ } -+ }, -+@@ -222,74 +222,74 @@ -+ "default": { -+ "searchOrder": ["Google", "Seznam"], -+ "visibleDefaultEngines": [ -+- "google-b-d", "seznam-cz", "ddg", "heureka-cz", "mapy-cz", "wikipedia-cz" -++ "ddg", "google-b-d", "seznam-cz", "heureka-cz", "mapy-cz", "wikipedia-cz" -+ ] -+ } -+ }, -+ "cy": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-en-GB", "ddg", "ebay-uk", "palasprint", "wikipedia-cy" -++ "ddg", "google-b-d", "amazon-en-GB", "ebay-uk", "palasprint", "wikipedia-cy" -+ ] -+ } -+ }, -+ "da": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-en-GB", "ddg", "wikipedia-da" -++ "ddg", "google-b-d", "bing", "amazon-en-GB", "wikipedia-da" -+ ] -+ } -+ }, -+ "de": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-de", "bing", "ddg", "ebay-de", "ecosia", "leo_ende_de", "wikipedia-de" -++ "ddg", "google-b-d", "amazon-de", "bing", "ebay-de", "ecosia", "leo_ende_de", "wikipedia-de" -+ ] -+ } -+ }, -+ "dsb": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-dsb" -++ "ddg", "google-b-d", "bing", "amazon-de", "ebay-de", "leo_ende_de", "wikipedia-dsb" -+ ] -+ } -+ }, -+ "el": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-en-GB", "bing", "ddg", "wikipedia-el" -++ "ddg", "google-b-d", "amazon-en-GB", "bing", "wikipedia-el" -+ ] -+ } -+ }, -+ "en-CA": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" -++ "ddg", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" -+ ] -+ }, -+ "KZ": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "BY": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "RU": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "TR": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "experimental-hidden": { -+ "visibleDefaultEngines": [ -+@@ -300,32 +300,32 @@ -+ "en-GB": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" -++ "ddg", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" -+ ] -+ }, -+ "KZ": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "BY": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "RU": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "TR": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "experimental-hidden": { -+ "visibleDefaultEngines": [ -+@@ -336,66 +336,66 @@ -+ "en-ZA": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" -++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" -+ ] -+ }, -+ "KZ": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "BY": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "RU": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "TR": { -+ "visibleDefaultEngines": [ -+- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" -++ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia" -+ ], -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ } -+ }, -+ "eo": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-eo" -++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-eo" -+ ] -+ } -+ }, -+ "es-AR": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazondotcom", "drae", "ddg", "mercadolibre-ar", "wikipedia-es" -++ "ddg", "google-b-d", "amazondotcom", "drae", "mercadolibre-ar", "wikipedia-es" -+ ] -+ } -+ }, -+ "es-CL": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "drae", "ddg", "mercadolibre-cl", "wikipedia-es" -++ "ddg", "google-b-d", "bing", "drae", "mercadolibre-cl", "wikipedia-es" -+ ] -+ } -+ }, -+ "es-ES": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "drae", "ddg", "ebay-es", "twitter", "wikipedia-es" -++ "ddg", "google-b-d", "bing", "drae", "ebay-es", "twitter", "wikipedia-es" -+ ] -+ } -+ }, -+ "es-MX": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "mercadolibre-mx", "wikipedia-es" -++ "ddg", "google-b-d", "bing", "mercadolibre-mx", "wikipedia-es" -+ ] -+ }, -+ "experimental-hidden": { -+@@ -407,49 +407,49 @@ -+ "et": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "neti-ee", "ddg", "osta-ee", "wikipedia-et", "eki-ee" -++ "ddg", "google-b-d", "neti-ee", "osta-ee", "wikipedia-et", "eki-ee" -+ ] -+ } -+ }, -+ "eu": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-eu" -++ "ddg", "google-b-d", "bing", "amazon-en-GB", "ebay-es", "wikipedia-eu" -+ ] -+ } -+ }, -+ "fa": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazondotcom", "bing", "ddg", "wikipedia-fa" -++ "ddg", "google-b-d", "amazondotcom", "bing", "wikipedia-fa" -+ ] -+ } -+ }, -+ "ff": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-france", "ddg", "wikipedia-fr" -++ "ddg", "google-b-d", "bing", "amazon-france", "wikipedia-fr" -+ ] -+ } -+ }, -+ "fi": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "wikipedia-fi" -++ "ddg", "google-b-d", "bing", "wikipedia-fi" -+ ] -+ } -+ }, -+ "fr": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-france", "ddg", "ebay-fr", "qwant", "wikipedia-fr" -++ "ddg", "google-b-d", "bing", "amazon-france", "ebay-fr", "qwant", "wikipedia-fr" -+ ] -+ } -+ }, -+ "fy-NL": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "bolcom-fy-NL", "ddg", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL" -++ "ddg", "google-b-d", "bing", "bolcom-fy-NL", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL" -+ ] -+ }, -+ "experimental-hidden": { -+@@ -461,105 +461,105 @@ -+ "ga-IE": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-en-GB", "ddg", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE" -++ "ddg", "google-b-d", "amazon-en-GB", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE" -+ ] -+ } -+ }, -+ "gd": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-en-GB", "bbc-alba", "ddg", "ebay-uk", "faclair-beag", "wikipedia-gd" -++ "ddg", "google-b-d", "amazon-en-GB", "bbc-alba", "ebay-uk", "faclair-beag", "wikipedia-gd" -+ ] -+ } -+ }, -+ "gl": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-gl" -++ "ddg", "google-b-d", "amazon-en-GB", "ebay-es", "wikipedia-gl" -+ ] -+ } -+ }, -+ "gn": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-gn" -++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-gn" -+ ] -+ } -+ }, -+ "gu-IN": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia-gu" -++ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia-gu" -+ ] -+ } -+ }, -+ "he": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "ddg", "wikipedia-he", "morfix-dic" -++ "ddg", "google-b-d", "wikipedia-he", "morfix-dic" -+ ] -+ } -+ }, -+ "hi-IN": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "wikipedia-hi" -++ "ddg", "google-b-d", "bing", "wikipedia-hi" -+ ] -+ } -+ }, -+ "hr": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-en-GB", "bing", "ddg", "eudict", "twitter", "wikipedia-hr" -++ "ddg", "google-b-d", "amazon-en-GB", "bing", "eudict", "twitter", "wikipedia-hr" -+ ] -+ } -+ }, -+ "hsb": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-hsb" -++ "ddg", "google-b-d", "bing", "amazon-de", "ebay-de", "leo_ende_de", "wikipedia-hsb" -+ ] -+ } -+ }, -+ "hu": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "ddg", "vatera", "wikipedia-hu" -++ "ddg", "google-b-d", "vatera", "wikipedia-hu" -+ ] -+ } -+ }, -+ "hy-AM": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazondotcom", "ddg", "list-am", "wikipedia-hy" -++ "ddg", "google-b-d", "amazondotcom", "list-am", "wikipedia-hy" -+ ] -+ } -+ }, -+ "ia": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ia" -++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-ia" -+ ] -+ } -+ }, -+ "id": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "ddg", "wikipedia-id" -++ "ddg", "google-b-d", "wikipedia-id" -+ ] -+ } -+ }, -+ "is": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-is" -++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-is" -+ ] -+ } -+ }, -+ "it": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-it", "ddg", "ebay-it", "wikipedia-it" -++ "ddg", "google-b-d", "bing", "amazon-it", "ebay-it", "wikipedia-it" -+ ] -+ } -+ }, -+@@ -567,7 +567,7 @@ -+ "default": { -+ "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて！goo", "Twitter", "Wikipedia (ja)"], -+ "visibleDefaultEngines": [ -+- "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg" -++ "ddg", "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja" -+ ] -+ } -+ }, -+@@ -575,159 +575,159 @@ -+ "default": { -+ "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて！goo", "Twitter", "Wikipedia (ja)"], -+ "visibleDefaultEngines": [ -+- "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg" -++ "ddg", "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja" -+ ] -+ } -+ }, -+ "ka": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ka" -++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-ka" -+ ] -+ } -+ }, -+ "kab": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "wikipedia-kab" -++ "ddg", "google-b-d", "bing", "wikipedia-kab" -+ ] -+ } -+ }, -+ "kk": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "yandex-kk", "google-b-d", "ddg", "flip", "twitter", "wikipedia-kk" -++ "ddg", "yandex-kk", "google-b-d", "flip", "twitter", "wikipedia-kk" -+ ] -+ }, -+ "KZ": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "BY": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "RU": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "TR": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ } -+ }, -+ "km": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-km" -++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-km" -+ ] -+ } -+ }, -+ "kn": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-in", "ddg", "kannadastore", "wikipedia-kn" -++ "ddg", "google-b-d", "bing", "amazon-in", "kannadastore", "wikipedia-kn" -+ ] -+ } -+ }, -+ "ko": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "ddg", "naver-kr", "daum-kr", "wikipedia-kr" -++ "ddg", "google-b-d", "naver-kr", "daum-kr", "wikipedia-kr" -+ ] -+ } -+ }, -+ "lij": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-it", "ddg", "ebay-it", "wikipedia-lij" -++ "ddg", "google-b-d", "bing", "amazon-it", "ebay-it", "wikipedia-lij" -+ ] -+ } -+ }, -+ "lo": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "wikipedia-lo", "twitter" -++ "ddg", "google-b-d", "bing", "wikipedia-lo", "twitter" -+ ] -+ } -+ }, -+ "lt": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "wikipedia-lt", "bing", "amazondotcom", "ddg", "twitter" -++ "ddg", "google-b-d", "wikipedia-lt", "bing", "amazondotcom", "twitter" -+ ] -+ } -+ }, -+ "ltg": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "ddg", "salidzinilv", "sslv", "wikipedia-ltg" -++ "ddg", "google-b-d", "salidzinilv", "sslv", "wikipedia-ltg" -+ ] -+ } -+ }, -+ "lv": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "ddg", "salidzinilv", "sslv", "wikipedia-lv" -++ "ddg", "google-b-d", "salidzinilv", "sslv", "wikipedia-lv" -+ ] -+ } -+ }, -+ "mai": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-in", "ddg", "twitter", "wikipedia-hi" -++ "ddg", "google-b-d", "bing", "amazon-in", "twitter", "wikipedia-hi" -+ ] -+ } -+ }, -+ "mk": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-mk" -++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-mk" -+ ] -+ } -+ }, -+ "ml": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia", "wikipedia-ml" -++ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia", "wikipedia-ml" -+ ] -+ } -+ }, -+ "mr": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-in", "ddg", "wikipedia-mr" -++ "ddg", "google-b-d", "amazon-in", "wikipedia-mr" -+ ] -+ } -+ }, -+ "ms": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ms" -++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-ms" -+ ] -+ } -+ }, -+ "my": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-my" -++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-my" -+ ] -+ } -+ }, -+ "nb-NO": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-en-GB", "bing", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO" -++ "ddg", "google-b-d", "amazon-en-GB", "bing", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO" -+ ] -+ } -+ }, -+ "ne-NP": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "twitter", "wikipedia-ne" -++ "ddg", "google-b-d", "bing", "twitter", "wikipedia-ne" -+ ] -+ } -+ }, -+ "nl": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "bolcom-nl", "ddg", "ebay-nl", "marktplaats-nl", "wikipedia-nl" -++ "ddg", "google-b-d", "bing", "bolcom-nl", "ebay-nl", "marktplaats-nl", "wikipedia-nl" -+ ] -+ }, -+ "experimental-hidden": { -+@@ -739,244 +739,244 @@ -+ "nn-NO": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-en-GB", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NN" -++ "ddg", "google-b-d", "bing", "amazon-en-GB", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NN" -+ ] -+ } -+ }, -+ "oc": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "twitter", "wikipedia-oc", "wiktionary-oc" -++ "ddg", "google-b-d", "bing", "twitter", "wikipedia-oc", "wiktionary-oc" -+ ] -+ } -+ }, -+ "or": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia-or" -++ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia-or" -+ ] -+ } -+ }, -+ "pa-IN": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia-pa" -++ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia-pa" -+ ] -+ } -+ }, -+ "pl": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "allegro-pl", "ddg", "pwn-pl", "wikipedia-pl", "wolnelektury-pl" -++ "ddg", "google-b-d", "allegro-pl", "pwn-pl", "wikipedia-pl", "wolnelektury-pl" -+ ] -+ } -+ }, -+ "pt-BR": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "mercadolivre", "twitter", "wikipedia-pt" -++ "ddg", "google-b-d", "bing", "mercadolivre", "twitter", "wikipedia-pt" -+ ] -+ } -+ }, -+ "pt-PT": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-en-GB", "ddg", "priberam", "wikipedia-pt" -++ "ddg", "google-b-d", "amazon-en-GB", "priberam", "wikipedia-pt" -+ ] -+ } -+ }, -+ "rm": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "ebay-ch", "leo_ende_de", "wikipedia-rm" -++ "ddg", "google-b-d", "bing", "ebay-ch", "leo_ende_de", "wikipedia-rm" -+ ] -+ } -+ }, -+ "ro": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ro" -++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-ro" -+ ] -+ } -+ }, -+ "ru": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "yandex-ru", "google-b-d", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru" -++ "ddg", "yandex-ru", "google-b-d", "ozonru", "priceru", "wikipedia-ru", "mailru" -+ ] -+ }, -+ "RU": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "BY": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "KZ": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "TR": { -+- "searchDefault": "Яндекс" -++ "searchDefault": "DuckDuckGo" -+ } -+ }, -+ "si": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazondotcom", "ddg", "wikipedia-si" -++ "ddg", "google-b-d", "amazondotcom", "wikipedia-si" -+ ] -+ } -+ }, -+ "sk": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "azet-sk", "atlas-sk", "ddg", "wikipedia-sk", "zoznam-sk" -++ "ddg", "google-b-d", "azet-sk", "atlas-sk", "wikipedia-sk", "zoznam-sk" -+ ] -+ } -+ }, -+ "sl": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "ceneji", "ddg", "najdi-si", "odpiralni", "twitter", "wikipedia-sl" -++ "ddg", "google-b-d", "ceneji", "najdi-si", "odpiralni", "twitter", "wikipedia-sl" -+ ] -+ } -+ }, -+ "son": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-france", "ddg", "wikipedia-fr" -++ "ddg", "google-b-d", "bing", "amazon-france", "wikipedia-fr" -+ ] -+ } -+ }, -+ "sq": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-en-GB", "ddg", "wikipedia-sq" -++ "ddg", "google-b-d", "bing", "amazon-en-GB", "wikipedia-sq" -+ ] -+ } -+ }, -+ "sr": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-en-GB", "bing", "ddg", "wikipedia-sr", "pogodak" -++ "ddg", "google-b-d", "amazon-en-GB", "bing", "wikipedia-sr", "pogodak" -+ ] -+ } -+ }, -+ "sv-SE": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "allaannonser-sv-SE", "ddg", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE" -++ "ddg", "google-b-d", "bing", "allaannonser-sv-SE", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE" -+ ] -+ } -+ }, -+ "ta": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-in", "ddg", "wikipedia-ta" -++ "ddg", "google-b-d", "amazon-in", "wikipedia-ta" -+ ] -+ } -+ }, -+ "te": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazon-in", "ddg", "wikipedia-te", "wiktionary-te" -++ "ddg", "google-b-d", "amazon-in", "wikipedia-te", "wiktionary-te" -+ ] -+ } -+ }, -+ "th": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "amazondotcom", "bing", "ddg", "longdo", "wikipedia-th" -++ "ddg", "google-b-d", "amazondotcom", "bing", "longdo", "wikipedia-th" -+ ] -+ } -+ }, -+ "tl": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-tl" -++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-tl" -+ ] -+ } -+ }, -+ "tr": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "yandex-tr", "google-b-d", "ddg", "twitter", "wikipedia-tr" -++ "ddg", "yandex-tr", "google-b-d", "twitter", "wikipedia-tr" -+ ] -+ }, -+ "TR": { -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "BY": { -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "KZ": { -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ }, -+ "RU": { -+- "searchDefault": "Yandex" -++ "searchDefault": "DuckDuckGo" -+ } -+ }, -+ "trs": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-es" -++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-es" -+ ] -+ } -+ }, -+ "uk": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "wikipedia-uk", "hotline-ua" -++ "ddg", "google-b-d", "bing", "wikipedia-uk", "hotline-ua" -+ ] -+ } -+ }, -+ "ur": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-in", "ddg", "twitter", "wikipedia-ur" -++ "ddg", "google-b-d", "bing", "amazon-in", "twitter", "wikipedia-ur" -+ ] -+ } -+ }, -+ "uz": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-uz" -++ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-uz" -+ ] -+ } -+ }, -+ "vi": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "coccoc", "ddg", "wikipedia-vi" -++ "ddg", "google-b-d", "coccoc", "wikipedia-vi" -+ ] -+ } -+ }, -+ "wo": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "amazon-france", "ddg", "ebay-fr", "twitter", "wikipedia-wo" -++ "ddg", "google-b-d", "bing", "amazon-france", "ebay-fr", "twitter", "wikipedia-wo" -+ ] -+ } -+ }, -+ "xh": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "bing", "ddg", "wikipedia" -++ "ddg", "google-b-d", "bing", "wikipedia" -+ ] -+ } -+ }, -+ "zh-CN": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "baidu", "google-b-d", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn" -++ "ddg", "baidu", "google-b-d", "bing", "wikipedia-zh-CN", "amazondotcn" -+ ] -+ }, -+ "CN": { -+- "searchDefault": "百度" -++ "searchDefault": "DuckDuckGo" -+ } -+ }, -+ "zh-TW": { -+ "default": { -+ "visibleDefaultEngines": [ -+- "google-b-d", "ddg", "readmoo", "wikipedia-zh-TW" -++ "ddg", "google-b-d", "readmoo", "wikipedia-zh-TW" -+ ] -+ } -+ } ++++ b/data/patches/fix-data-reporting-check.patch +@@ -0,0 +1,22 @@ ++--- a/old-configure.in.orig 1980-01-01 18:59:51.000000000 -0500 +++++ b/old-configure.in 2019-10-28 04:13:17.343606008 -0400 ++@@ -3116,7 +3116,7 @@ ++ dnl If we have any service that uploads data (and requires data submission ++ dnl policy alert), set MOZ_DATA_REPORTING. ++ dnl We need SUBST for build system and DEFINE for xul preprocessor. ++-if test -n "$MOZ_TELEMETRY_REPORTING" || test -n "$MOZ_SERVICES_HEALTHREPORT" || test -n "$MOZ_CRASHREPORTER"; then +++if test "$MOZ_TELEMETRY_REPORTING" = 1 || test "$MOZ_SERVICES_HEALTHREPORT" = 1 || test "$MOZ_CRASHREPORTER" = 1; then ++ MOZ_DATA_REPORTING=1 ++ AC_DEFINE(MOZ_DATA_REPORTING) ++ AC_SUBST(MOZ_DATA_REPORTING) ++--- a/old-configure.orig 1980-01-01 18:59:51.000000000 -0500 +++++ b/old-configure 2019-10-28 04:15:41.772322191 -0400 ++@@ -12150,7 +12150,7 @@ ++ ++ ++ ++-if test -n "$MOZ_TELEMETRY_REPORTING" || test -n "$MOZ_SERVICES_HEALTHREPORT" || test -n "$MOZ_CRASHREPORTER"; then +++if test "$MOZ_TELEMETRY_REPORTING" = 1 || test "$MOZ_SERVICES_HEALTHREPORT" = 1 || test "$MOZ_CRASHREPORTER" = 1; then ++ MOZ_DATA_REPORTING=1 ++ cat >> confdefs.pytmp <<\EOF ++ (''' MOZ_DATA_REPORTING ''', ' 1 ') diff --git a/data/patches/legacy-profiles.patch b/data/patches/legacy-profiles.patch +deleted file mode 100644 +index 33e9e99..0000000 +--- a/data/patches/legacy-profiles.patch ++++ /dev/null +@@ -1,11 +0,0 @@ +---- a/browser/moz.configure.orig 1980-01-01 18:59:51.000000000 -0500 +-+++ b/browser/moz.configure 2019-10-26 21:58:37.719617701 -0400 +-@@ -7,7 +7,7 @@ +- imply_option('MOZ_PLACES', True) +- imply_option('MOZ_SERVICES_HEALTHREPORT', True) +- imply_option('MOZ_SERVICES_SYNC', True) +--imply_option('MOZ_DEDICATED_PROFILES', True) +-+imply_option('MOZ_DEDICATED_PROFILES', False) +- imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True) +- +- with only_when(target_is_linux & compile_environment): +diff --git a/data/patches/moz-configure-changes.patch b/data/patches/moz-configure-changes.patch new file mode 100644 -index 0000000..33e9e99 +index 0000000..aa6f1a5 --- /dev/null -+++ b/data/patches/legacy-profiles.patch -@@ -0,0 +1,11 @@ ++++ b/data/patches/moz-configure-changes.patch +@@ -0,0 +1,14 @@ +--- a/browser/moz.configure.orig 1980-01-01 18:59:51.000000000 -0500 -++++ b/browser/moz.configure 2019-10-26 21:58:37.719617701 -0400 -+@@ -7,7 +7,7 @@ +++++ b/browser/moz.configure 2019-10-28 01:36:13.132873871 -0400 ++@@ -5,9 +5,9 @@ ++ # file, You can obtain one at http://mozilla.org/MPL/2.0/. ++ + imply_option('MOZ_PLACES', True) -+ imply_option('MOZ_SERVICES_HEALTHREPORT', True) ++-imply_option('MOZ_SERVICES_HEALTHREPORT', True) +++imply_option('MOZ_SERVICES_HEALTHREPORT', False) + imply_option('MOZ_SERVICES_SYNC', True) +-imply_option('MOZ_DEDICATED_PROFILES', True) ++imply_option('MOZ_DEDICATED_PROFILES', False) + imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True) + + with only_when(target_is_linux & compile_environment): +-- +2.23.0 + +From 62f50f15abc91483c6aa7a2ac7ebb972e6f9affd Mon Sep 17 00:00:00 2001 +From: Mark H Weaver +Date: Mon, 28 Oct 2019 13:05:28 -0400 +Subject: [PATCH 3/4] Disable MOZ_BLOCK_PROFILE_DOWNGRADE. + +It would be desirable to prevent downgrades from one major version of +IceCat to another. However, as MOZ_BLOCK_PROFILE_DOWNGRADE is +currently implemented, it prevents downgrades from one build of +IceCat-68.2 to an earlier build of IceCat-68.2. Until we can find a +satisfactory solution, we disable this functionality entirely. + +* data/patches/moz-configure-changes.patch: Set +MOZ_BLOCK_PROFILE_DOWNGRADE to 'False'. +--- + data/patches/moz-configure-changes.patch | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/data/patches/moz-configure-changes.patch b/data/patches/moz-configure-changes.patch +index aa6f1a5..53091a4 100644 +--- a/data/patches/moz-configure-changes.patch ++++ b/data/patches/moz-configure-changes.patch +@@ -1,6 +1,6 @@ + --- a/browser/moz.configure.orig 1980-01-01 18:59:51.000000000 -0500 +-+++ b/browser/moz.configure 2019-10-28 01:36:13.132873871 -0400 +-@@ -5,9 +5,9 @@ +++++ b/browser/moz.configure 2019-10-28 13:04:11.469562089 -0400 ++@@ -5,10 +5,10 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + imply_option('MOZ_PLACES', True) +@@ -8,7 +8,9 @@ + +imply_option('MOZ_SERVICES_HEALTHREPORT', False) + imply_option('MOZ_SERVICES_SYNC', True) + -imply_option('MOZ_DEDICATED_PROFILES', True) ++-imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True) + +imply_option('MOZ_DEDICATED_PROFILES', False) +- imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True) +++imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', False) + + with only_when(target_is_linux & compile_environment): ++ option(env='MOZ_NO_PIE_COMPAT', +-- +2.23.0 + +From 036f74092d223976054f9eafd8caa056f5975c54 Mon Sep 17 00:00:00 2001 +From: Mark H Weaver +Date: Mon, 28 Oct 2019 19:57:37 -0400 +Subject: [PATCH 4/4] Improve branding for version 68 ESR. + +* data/branding/icecat/locales/en-US/brand.dtd: Add brandProductName. +* data/branding/icecat/locales/en-US/brand.ftl: Add +brand-shorter-name, brand-full-name, brand-product-name, +vendor-short-name, and trademarkInfo. +* data/branding/icecat/locales/en-US/brand.properties: Add +brandProductName. +* makeicecat: Limit replacement of trademarkInfo.part1 of brand.dtd +files to only be done within l10n directory. Replace trademarkInfo of +brand.ftl files within l10n directory. +--- + data/branding/icecat/locales/en-US/brand.dtd | 1 + + data/branding/icecat/locales/en-US/brand.ftl | 5 +++++ + data/branding/icecat/locales/en-US/brand.properties | 1 + + makeicecat | 3 ++- + 4 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/data/branding/icecat/locales/en-US/brand.dtd b/data/branding/icecat/locales/en-US/brand.dtd +index 3788266..475ce7d 100644 +--- a/data/branding/icecat/locales/en-US/brand.dtd ++++ b/data/branding/icecat/locales/en-US/brand.dtd +@@ -5,5 +5,6 @@ + + + ++ + + +diff --git a/data/branding/icecat/locales/en-US/brand.ftl b/data/branding/icecat/locales/en-US/brand.ftl +index bd7fbe0..7c9fcc8 100644 +--- a/data/branding/icecat/locales/en-US/brand.ftl ++++ b/data/branding/icecat/locales/en-US/brand.ftl +@@ -2,4 +2,9 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + ++-brand-shorter-name = IceCat + -brand-short-name = IceCat ++-brand-full-name = GNU IceCat ++-brand-product-name = IceCat ++-vendor-short-name = GNU ++trademarkInfo = The IceCat logo is Copyright 2008-2015 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later version. +diff --git a/data/branding/icecat/locales/en-US/brand.properties b/data/branding/icecat/locales/en-US/brand.properties +index 85e2894..9b9cf97 100644 +--- a/data/branding/icecat/locales/en-US/brand.properties ++++ b/data/branding/icecat/locales/en-US/brand.properties +@@ -5,6 +5,7 @@ + brandShorterName=IceCat + brandShortName=IceCat + brandFullName=IceCat ++brandProductName=IceCat + vendorShortName=GNU + + syncBrandShortName=Sync +diff --git a/makeicecat b/makeicecat +index 1bcf465..3ff2ead 100644 +--- a/makeicecat ++++ b/makeicecat +@@ -226,7 +226,8 @@ cp $DATA/bookmarks.html.in browser/locales/generic/profile/bookmarks.html.in + + # Custom legal about pages + +-find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i ++find l10n -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i ++find l10n -wholename '*/brand.ftl' |xargs /bin/sed 's/^trademarkInfo = .*/trademarkInfo = The IceCat logo is Copyright 2008-2015 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later version./' -i + + for STRING in rights.intro-point3-unbranded rights.intro-point4a-unbranded rights.intro-point4b-unbranded rights.intro-point4c-unbranded + do +-- +2.23.0 + diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch index a9920d6474..90a79eebc9 100644 --- a/gnu/packages/patches/icecat-makeicecat.patch +++ b/gnu/packages/patches/icecat-makeicecat.patch @@ -25,7 +25,7 @@ index b04c731..06d1f3f 100644 -wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc -gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 -gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc --echo -n f56f5fa5a4744be0b9acf259cb991254d708a50b9a0a12d1d846ffa5a6c409ac firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +-echo -n 85f1c2eaf68ebedcbc0b78a342f6d16ef0865dedd426a1bba94b75c85f716f38 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - - -echo Extracting Firefox tarball -tar -xf firefox-${FFVERSION}esr.source.tar.xz @@ -37,7 +37,7 @@ index b04c731..06d1f3f 100644 +# wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc +# gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 +# gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc -+# echo -n f56f5fa5a4744be0b9acf259cb991254d708a50b9a0a12d1d846ffa5a6c409ac firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - ++# echo -n 85f1c2eaf68ebedcbc0b78a342f6d16ef0865dedd426a1bba94b75c85f716f38 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +# +# echo Extracting Firefox tarball +# tar -xf firefox-${FFVERSION}esr.source.tar.xz @@ -96,24 +96,9 @@ index b04c731..06d1f3f 100644 -cd $SOURCEDIR +# cd $SOURCEDIR + shopt -s nullglob for patch in $DATA/patches/*.patch; do - echo Patching with file: $patch -@@ -226,10 +226,10 @@ cp $DATA/bookmarks.html.in browser/locales/generic/profile/bookmarks.html.in - - find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i - --for STRING in rights.intro-point3-unbranded rights.intro-point4a-unbranded rights.intro-point4b-unbranded rights.intro-point4c-unbranded --do -- find -name aboutRights.dtd | xargs sed -i "s/ENTITY $STRING.*/ENTITY $STRING \"\">/" --done -+# for STRING in rights.intro-point3-unbranded rights.intro-point4a-unbranded rights.intro-point4b-unbranded rights.intro-point4c-unbranded -+# do -+# find -name aboutRights.dtd | xargs sed -i "s/ENTITY $STRING.*/ENTITY $STRING \"\">/" -+# done - - for STRING in rights-intro-point-2 rights-intro-point-3 rights-intro-point-4 rights-intro-point-5 rights-intro-point-6 rights-webservices rights-safebrowsing - do -@@ -595,6 +595,6 @@ sed 's/777/755/;' -i toolkit/crashreporter/google-breakpad/Makefile.in +@@ -598,6 +598,6 @@ sed 's/777/755/;' -i toolkit/crashreporter/google-breakpad/Makefile.in # Fix CVE-2012-3386 /bin/sed 's/chmod a+w/chmod u+w/' -i ./js/src/ctypes/libffi/Makefile.in ./toolkit/crashreporter/google-breakpad/Makefile.in ./toolkit/crashreporter/google-breakpad/src/third_party/glog/Makefile.in || true -- cgit v1.2.3 From 36f5f23c1af640782aa47dbfed6352e3d4c957ff Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 29 Oct 2019 00:04:26 -0700 Subject: gnu: diffoscope: Add additional native-inputs for tests. * gnu/packages/diffoscope (diffoscope)[native-inputs]: Add python-pypdf2 and python-progressbar33. --- gnu/packages/diffoscope.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 47dd36b919..cfa98f63f2 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -153,6 +153,8 @@ (native-inputs `(("python-pytest" ,python-pytest) ("python-chardet" ,python-chardet) ("python-binwalk" ,python-binwalk) + ("python-pypdf2" ,python-pypdf2) + ("python-progressbar33" ,python-progressbar33) ;; test suite skips tests when tool is missing ,@(match (%current-system) ;; ghc is only available on x86 currently. -- cgit v1.2.3 From af2d37133b43ec232d99960b924f22575624d7af Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Mon, 28 Oct 2019 15:41:29 +0100 Subject: gnu: python-cleo: Update to 0.6.8. * gnu/packages/python-xyz.scm (python-cleo): Update to 0.6.8. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 04d72e285b..f1132c5206 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10592,16 +10592,16 @@ Wikipedia code samples at (define-public python-cleo (package (name "python-cleo") - (version "0.6.1") + (version "0.6.8") (source (origin (method url-fetch) (uri (pypi-uri "cleo" version)) (sha256 (base32 - "0q1cf0szr0d54am4pypzwdnm74zpladdsinad94c2fz5i06fdpf7")))) + "06zp695hq835rkaq6irr1ds1dp2qfzyf32v60vxpd8rcnxv319l5")))) (build-system python-build-system) (native-inputs - `(;; For testing + `( ;; For testing ("python-mock" ,python-mock) ("python-pytest-mock" ,python-pytest-mock) ("python-pytest" ,python-pytest))) -- cgit v1.2.3 From 2be85c4531adcf2b59641b75e66c458b895e5a96 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Mon, 28 Oct 2019 15:41:30 +0100 Subject: gnu: Add python-tomlkit. * gnu/packages/python-xyz.scm (python-tomlkit): New public variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f1132c5206..1ed79a9a4f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10619,6 +10619,31 @@ docstring and colored output.") (define-public python2-cleo (package-with-python2 python-cleo)) +(define-public python-tomlkit + (package + (name "python-tomlkit") + (version "0.5.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tomlkit" version)) + (sha256 + (base32 + "18820ga5z3if1w8dvykxrfm000akracq01ic402xrbljgbn5grn4")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page + "https://github.com/sdispater/tomlkit") + (synopsis "Style preserving TOML library") + (description + "TOML Kit is a 0.5.0-compliant TOML library. It includes a parser that +preserves all comments, indentations, whitespace and internal element ordering, +and makes them accessible and editable via an intuitive API. It can also +create new TOML documents from scratch using the provided helpers. Part of the +implementation as been adapted, improved and fixed from Molten.") + (license license:expat))) + (define-public python-lazy-object-proxy (package (name "python-lazy-object-proxy") -- cgit v1.2.3 From 0bb322014084ee76f193bbc3348f29479f014e23 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Mon, 28 Oct 2019 15:41:31 +0100 Subject: gnu: Add python-shellingham. * gnu/packages/python-xyz.scm (python-shellingham): New public variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1ed79a9a4f..edca719547 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10644,6 +10644,26 @@ create new TOML documents from scratch using the provided helpers. Part of the implementation as been adapted, improved and fixed from Molten.") (license license:expat))) +(define-public python-shellingham + (package + (name "python-shellingham") + (version "1.3.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "shellingham" version)) + (sha256 + (base32 + "1q7kws7w4x2hji3g7y0ni9ddk4sd676ylrb3db54gbpys6xj6nwq")))) + (build-system python-build-system) + (home-page + "https://github.com/sarugaku/shellingham") + (synopsis "Tool to detect surrounding shell") + (description + "Shellingham detects what shell the current Python executable is +running in.") + (license license:isc))) + (define-public python-lazy-object-proxy (package (name "python-lazy-object-proxy") -- cgit v1.2.3 From aee92957b5032196cb830f0288557de864c9c644 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Mon, 28 Oct 2019 15:41:32 +0100 Subject: gnu: Add python-memcached. * gnu/packages/python-xyz.scm (python-memcached): New public variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index edca719547..e082351e36 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10664,6 +10664,28 @@ implementation as been adapted, improved and fixed from Molten.") running in.") (license license:isc))) +(define-public python-memcached + (package + (name "python-memcached") + (version "1.59") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-memcached" version)) + (sha256 + (base32 + "0kvyapavbirk2x3n1jx4yb9nyigrj1s3x15nm3qhpvhkpqvqdqm2")))) + (build-system python-build-system) + (propagated-inputs `(("python-six" ,python-six))) + (home-page + "https://github.com/linsomniac/python-memcached") + (synopsis "Pure python memcached client") + (description + "This software is a pure Python interface to the memcached memory cache +daemon. It is the client side software which allows storing values in one or +more, possibly remote, memcached servers.") + (license license:psfl))) + (define-public python-lazy-object-proxy (package (name "python-lazy-object-proxy") -- cgit v1.2.3 From b2ac2508b09f264b11721fa42edefd2b96ac6476 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Mon, 28 Oct 2019 15:41:33 +0100 Subject: gnu: Add python-clikit. * gnu/packages/python-xyz.scm (python-clikit): New public variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e082351e36..00bc41083a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10686,6 +10686,28 @@ daemon. It is the client side software which allows storing values in one or more, possibly remote, memcached servers.") (license license:psfl))) +(define-public python-clikit + (package + (name "python-clikit") + (version "0.2.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "clikit" version)) + (sha256 + (base32 + "0dc8czib5f4j9px1ivcpqnmivnx2zjpc0xb00ldrhsqylks7r06n")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pastel" ,python-pastel) + ("python-pylev" ,python-pylev))) + (home-page "https://github.com/sdispater/clikit") + (synopsis "Group of utilities to build command line interfaces") + (description + "CliKit is a group of utilities to build testable command line +interfaces.") + (license license:expat))) + (define-public python-lazy-object-proxy (package (name "python-lazy-object-proxy") -- cgit v1.2.3 From c6f008d6266a443344ce89e222c9534b2056d806 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Mon, 28 Oct 2019 15:41:34 +0100 Subject: gnu: Add python-msgpack-python. * gnu/packages/python-xyz.scm (python-msgpack-python): New public variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 00bc41083a..c518783bb0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10708,6 +10708,27 @@ more, possibly remote, memcached servers.") interfaces.") (license license:expat))) +(define-public python-msgpack-python + (package + (name "python-msgpack-python") + (version "0.5.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "msgpack-python" version)) + (sha256 + (base32 + "16wh8qgybmfh4pjp8vfv78mdlkxfmcasg78lzlnm6nslsfkci31p")))) + (build-system python-build-system) + (home-page "http://msgpack.org/") + (synopsis "Package to deserialize messages in MessagePack binary format") + (description + "MessagePack is an efficient binary serialization format. It lets you +exchange data among multiple languages like JSON. But it's faster and +smaller. Small integers are encoded into a single byte, and typical short +strings require only one extra byte in addition to the strings themselves.") + (license license:asl2.0))) + (define-public python-lazy-object-proxy (package (name "python-lazy-object-proxy") -- cgit v1.2.3 From badc1c630f6406b060cdcfbc7b846ba7c5e3c612 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Mon, 28 Oct 2019 15:41:35 +0100 Subject: gnu: Add python-cachy. * gnu/packages/python-xyz.scm (python-cachy): New public variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c518783bb0..0927601027 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10729,6 +10729,34 @@ smaller. Small integers are encoded into a single byte, and typical short strings require only one extra byte in addition to the strings themselves.") (license license:asl2.0))) +(define-public python-cachy + (package + (name "python-cachy") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cachy" version)) + (sha256 + (base32 + "0v6mjyhgx6j7ya20bk69cr3gdzdkdf6psay0h090rscclgji65dp")))) + (build-system python-build-system) + (native-inputs + `(("python-fakeredis" ,python-fakeredis) + ("python-flexmock" ,python-flexmock) + ("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-memcached" ,python-memcached) + ("python-msgpack-python" ,python-msgpack-python) + ("python-redis" ,python-redis))) + (home-page "https://github.com/sdispater/cachy") + (synopsis "Simple yet effective caching library") + (description + "Cachy provides a simple yet effective caching library. A simple but +powerful API: thread-safety; decorator syntax; support for memcached, redis, +database, file, dict stores. Cachy supports python versions 2.7+ and 3.2+.") + (license license:expat))) + (define-public python-lazy-object-proxy (package (name "python-lazy-object-proxy") -- cgit v1.2.3 From 2015767cd1143889dca4f73c35ad2764059984f9 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Mon, 28 Oct 2019 15:41:36 +0100 Subject: gnu: python-cachecontrol: Update to 0.12.5. * gnu/packages/python-web.scm (python-cachecontrol): Update to 0.12.5. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-web.scm | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b79b10d51e..eb25bd0ade 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2013,7 +2013,7 @@ provide an easy-to-use Python interface for building OAuth1 and OAuth2 clients." (define-public python-cachecontrol (package (name "python-cachecontrol") - (version "0.11.6") + (version "0.12.5") (source (origin (method git-fetch) @@ -2024,25 +2024,12 @@ provide an easy-to-use Python interface for building OAuth1 and OAuth2 clients." (file-name (git-file-name name version)) (sha256 (base32 - "0pb16bzbkk99nh317xyfk8fxc2ngimsbz7lz9pxsw8c82n83d4dh")))) + "03lgc65sl04n0cgzmmgg99bk83f9i6k8yrmcd4hpl46q1pymn0kz")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - ;; Drop test that requires internet access. - (delete-file "tests/test_regressions.py") - (setenv "PYTHONPATH" - (string-append (getcwd) "/build/lib:" - (getenv "PYTHONPATH"))) - (invoke "py.test" "-vv") - #t))))) - (native-inputs - `(("python-pytest" ,python-pytest) - ("python-redis" ,python-redis) - ("python-webtest" ,python-webtest) - ("python-mock" ,python-mock))) + ;; Versions > 0.11.6 depend on CherryPy for testing. + ;; It's too much work to package CherryPy for now. + `(#:tests? #f)) (propagated-inputs `(("python-requests" ,python-requests) ("python-lockfile" ,python-lockfile))) -- cgit v1.2.3 From 617bb67b4eb2a2de7a440c77853de85e9c4c09eb Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Mon, 28 Oct 2019 15:41:37 +0100 Subject: gnu: Add poetry. * gnu/packages/python-xyz.scm (poetry): New public variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-xyz.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0927601027..98e2d7e92b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10757,6 +10757,53 @@ powerful API: thread-safety; decorator syntax; support for memcached, redis, database, file, dict stores. Cachy supports python versions 2.7+ and 3.2+.") (license license:expat))) +(define-public poetry + (package + (name "poetry") + (version "0.12.17") + ;; Poetry can only be built from source with poetry. + (source + (origin + (method url-fetch) + (uri (pypi-uri "poetry" version)) + (sha256 + (base32 + "0gxwcd65qjmzqzppf53x51sic1rbcd9py6cdzx3aprppipimslvf")))) + (build-system python-build-system) + (arguments + `(#:tests? #f ;; Pypi does not have tests. + #:phases + (modify-phases %standard-phases + (replace 'build + (lambda _ + ;; Bug in poetry https://github.com/sdispater/poetry/issues/866. + (invoke "sed" "-i" "-e" "s/from distutils.core/from setuptools/" + "setup.py") + #t))))) + (propagated-inputs + `(("python-cachecontrol" ,python-cachecontrol) + ("python-cachy" ,python-cachy) + ("python-cleo" ,python-cleo) + ("python-glob2" ,python-glob2) + ("python-html5lib" ,python-html5lib) + ("python-jsonschema" ,python-jsonschema) + ("python-msgpack" ,python-msgpack) + ("python-pathlib2" ,python-pathlib2) + ("python-pkginfo" ,python-pkginfo) + ("python-pyparsing" ,python-pyparsing) + ("python-pyrsistent" ,python-pyrsistent) + ("python-requests" ,python-requests) + ("python-requests-toolbelt" ,python-requests-toolbelt) + ("python-shellingham" ,python-shellingham) + ("python-tomlkit" ,python-tomlkit) + ("python-virtualenv" ,python-virtualenv))) + (home-page "https://poetry.eustace.io/") + (synopsis "Python dependency management and packaging made easy") + (description "Poetry is a tool for dependency management and packaging +in Python. It allows you to declare the libraries your project depends on and +it will manage (install/update) them for you.") + (license license:expat))) + (define-public python-lazy-object-proxy (package (name "python-lazy-object-proxy") -- cgit v1.2.3 From 32325c999995322009f6aecb732d44c3a642f7e6 Mon Sep 17 00:00:00 2001 From: Stephen Webber Date: Mon, 28 Oct 2019 20:46:58 -0500 Subject: gnu: emacs-helm-projectile: Update package. * gnu/packages/emacs-xyz.scm (emacs-helm-projectile): Update package. Signed-off-by: Mathieu Othacehe --- gnu/packages/emacs-xyz.scm | 48 +++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0ce8739a77..67f9c8c3be 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6955,29 +6955,33 @@ for search-based navigation of buffers.") as well as features for editing search results.") (license license:gpl3+)))) +;; There hasn't been a tag or release since 2016, so we take the latest +;; commit. (define-public emacs-helm-projectile - (package - (name "emacs-helm-projectile") - (version "0.14.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/bbatsov/helm-projectile.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0lph38p112fridighqcizpsyzjbv7qr3d8prbfj6w6q6gfl6cna4")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-dash" ,emacs-dash) - ("emacs-helm" ,emacs-helm) - ("emacs-projectile" ,emacs-projectile))) - (home-page "https://github.com/bbatsov/helm-projectile") - (synopsis "Helm integration for Projectile") - (description - "This Emacs library provides a Helm interface for Projectile.") - (license license:gpl3+))) + (let ((commit "5328b74dddcee8d1913803ca8167868831a07463") + (version "0.14.0") + (revision "1")) + (package + (name "emacs-helm-projectile") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bbatsov/helm-projectile.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0a811cblrvc8llpv771b8dppgxs6bwjyvjy3qn2xns4nigvn93s0")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-helm" ,emacs-helm) + ("emacs-projectile" ,emacs-projectile))) + (home-page "https://github.com/bbatsov/helm-projectile") + (synopsis "Helm integration for Projectile") + (description + "This Emacs library provides a Helm interface for Projectile.") + (license license:gpl3+)))) (define-public emacs-taskrunner (let ((commit "3afd4a546d42339543d3d4e51b175fc3e82b3358") -- cgit v1.2.3 From 3af12c75f9b6d6da1ded9ae4c7d4afe9071eeb68 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Mon, 28 Oct 2019 16:32:02 +0100 Subject: gnu: emacs-evil: Remove undo-tree dependency. Because it is buggy and unnecessary. See . * gnu/packages/emacs-xyz.scm (emacs-evil)[propagated-inputs]: Remove emacs-undo-tree and emacs-goto-chg. --- gnu/packages/emacs-xyz.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 67f9c8c3be..c12c174e2e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7422,9 +7422,6 @@ news items, openrc and runscripts.") (base32 "1833w397xhac5g3pp25szr2gyvclxy91aw27azvbmsx94pyk2a3q")))) (build-system emacs-build-system) - (propagated-inputs - `(("emacs-undo-tree" ,emacs-undo-tree) - ("emacs-goto-chg" ,emacs-goto-chg))) (home-page "https://github.com/emacs-evil/evil") (synopsis "Extensible Vi layer for Emacs") (description -- cgit v1.2.3 From 10224994dab466638fa70dfc9a257cc6e18288e7 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Tue, 29 Oct 2019 11:59:41 +0100 Subject: gnu: emacs-evil: Fix test helpers. * gnu/packages/emacs-xyz.scm (emacs-evil)[arguments]: Add a 'fix-test-helpers' phase. --- gnu/packages/emacs-xyz.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c12c174e2e..1be819728f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7421,6 +7421,14 @@ news items, openrc and runscripts.") (sha256 (base32 "1833w397xhac5g3pp25szr2gyvclxy91aw27azvbmsx94pyk2a3q")))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'fix-test-helpers + (lambda _ + (substitute* "evil-test-helpers.el" + (("\\(undo-tree-mode 1\\)") "")) + #t))))) (build-system emacs-build-system) (home-page "https://github.com/emacs-evil/evil") (synopsis "Extensible Vi layer for Emacs") -- cgit v1.2.3 From e1e00e87e6e625d255477d5ec61e70bb70290189 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 29 Oct 2019 13:06:51 +0100 Subject: gnu: perl-http-cookies: Update to 6.05. * gnu/packages/web.scm (perl-http-cookies): Update to 6.05. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 8748fe0681..07437e4f28 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2860,7 +2860,7 @@ jar in conformance with RFC 6265 .") (define-public perl-http-cookies (package (name "perl-http-cookies") - (version "6.04") + (version "6.05") (source (origin (method url-fetch) (uri (string-append @@ -2868,7 +2868,7 @@ jar in conformance with RFC 6265 .") version ".tar.gz")) (sha256 (base32 - "1m0kxcirbvbkrm2c59p1bkbvzlcdymg8fdpa7wlxijlx0xwz1iqc")))) + "0pbgns2gwgvgg9rglah7ryw0jj13aykyf38lnhm3rwzw3c2cvqaq")))) (build-system perl-build-system) (propagated-inputs `(("perl-http-message" ,perl-http-message))) -- cgit v1.2.3 From 0300085cc984236c9557d16badbe9e6e46633ef3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 29 Oct 2019 13:11:47 +0100 Subject: gnu: cereal: Don't use unstable tarball. * gnu/packages/serialization.scm (cereal)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/serialization.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index ea016bc6c2..249b6f1af5 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -53,14 +53,15 @@ (package (name "cereal") (version "1.2.1") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/USCiLab/cereal/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0kj32h3j2128anig0g9gzw82kfyd5xqfkwq6vdyv900jx8i1qckx")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/USCiLab/cereal.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vxkrsnxkiblzi1z61vfix167c184fy868sgwj2dxxgbgjcq2nrh")))) (build-system cmake-build-system) (arguments `(;; The only included tests are portability tests requiring -- cgit v1.2.3 From ff68988aa17e11bc771f3e25506b4746b1117b92 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 29 Oct 2019 13:12:20 +0100 Subject: gnu: perl-libwww: Update to 6.41. * gnu/packages/web.scm (perl-libwww): Update to 6.41. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 07437e4f28..d106bf7a6f 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3204,7 +3204,7 @@ select or poll.") (define-public perl-libwww (package (name "perl-libwww") - (version "6.39") + (version "6.41") (source (origin (method url-fetch) (uri (string-append @@ -3212,7 +3212,7 @@ select or poll.") version ".tar.gz")) (sha256 (base32 - "1mblfwz3g7vmyykmb0mcbmmad77rwx55fwaca9ymv9wajd3pg3cs")))) + "0jh67946fwd33ap3xy8df0421d2mr6lmhalhkf1p7dx2b7fil9wf")))) (build-system perl-build-system) (native-inputs `(("perl-test-fatal" ,perl-test-fatal) -- cgit v1.2.3 From cbaf756caeee7935b69010ba1882f7dce6d0690f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 29 Oct 2019 13:58:17 +0100 Subject: gnu: sudo: Update to 1.8.29. * gnu/packages/admin.scm (sudo): Update to 1.8.29. [arguments]: Disable new /etc/sudoers syntax check. --- gnu/packages/admin.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 82f1bb4eb8..08dac76a41 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1128,7 +1128,7 @@ system administrator.") (define-public sudo (package (name "sudo") - (version "1.8.28p1") + (version "1.8.29") (source (origin (method url-fetch) (uri @@ -1138,7 +1138,7 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 - "09xhx2k7j6wlqs9bl7snamd4k6lkyv9ycjwdspgbbqrimy25mfi3")) + "0z4wyadh9cks17gdpfgx4kvbrlnyb6nai2sd6chk7qh4jsngylyf")) (modules '((guix build utils))) (snippet '(begin @@ -1184,6 +1184,12 @@ system administrator.") (("\\$\\(DESTDIR\\)\\$\\(vardir\\)") ;; Don't try to create /var/db/sudo. "$(TMPDIR)/dummy")) + + ;; ‘Checking existing [/etc/]sudoers file for syntax errors’ is + ;; not the task of the build system, and fails. + (substitute* "plugins/sudoers/Makefile.in" + (("^pre-install:" match) + (string-append match "\ndisabled-" match))) #t))) ;; XXX: The 'testsudoers' test series expects user 'root' to exist, but -- cgit v1.2.3 From dd88c89e0d0c0a47caff8c4f6fbbfc76a23ee5d9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 29 Oct 2019 14:03:18 +0100 Subject: gnu: love: Update to 11.3. * gnu/packages/game-development.scm (love): Update to 11.3. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index eb92443e0d..526a29a3ce 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -622,14 +622,14 @@ archive on a per-file basis.") (define-public love (package (name "love") - (version "11.1") + (version "11.3") (source (origin (method url-fetch) (uri (string-append "https://bitbucket.org/rude/love/downloads/" "love-" version "-linux-src.tar.gz")) (sha256 (base32 - "1pkwiszmjs0xrwk0wqbc5cp9108b1y8gwsid0gqk1s0x09q9lpmw")))) + "0m8lvlabmcchskx4qpzkdlsm44360f3j0q3vvvj2388cfnvhv7v4")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 3275d43dd93fd99358d6b67fdc9262a9bfe12d8c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 29 Oct 2019 14:09:55 +0100 Subject: gnu: lollypop: Don't use NAME in source URI. * gnu/packages/gnome.scm (lollypop)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bb842574b2..3c7882ca3d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7789,8 +7789,8 @@ views can be printed as PDF or PostScript files, or exported to HTML.") (origin (method url-fetch) (uri (string-append "https://gitlab.gnome.org/World/lollypop/uploads/" - "5a7cd7c72b6d83ae08d0c54c4691f9df/" - name "-" version ".tar.xz")) + "aa4fbd92bf338296c28e54710271ccab/" + "lollypop-" version ".tar.xz")) (sha256 (base32 "1r5wn0bja9psz6nr1rcaysdkkwz84rbyzpdfw66cxa6wiy52pkjm")))) -- cgit v1.2.3 From e14d7f20f4359b2ff744042fbcb41c9d4dab6781 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 29 Oct 2019 14:37:21 +0100 Subject: gnu: xf86-input-wacom: Update to 0.38.0. * gnu/packages/xdisorg.scm (xf86-input-wacom): Update to 0.38.0. --- gnu/packages/xdisorg.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index d4312f4635..cb2f9d40ae 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -997,7 +997,7 @@ Wacom tablet applet.") (define-public xf86-input-wacom (package (name "xf86-input-wacom") - (version "0.36.1") + (version "0.38.0") (source (origin (method url-fetch) @@ -1006,8 +1006,7 @@ Wacom tablet applet.") "xf86-input-wacom-" version "/" "xf86-input-wacom-" version ".tar.bz2")) (sha256 - (base32 - "029y8varbricba2dzhzhy0ndd7lbfif411ca8c3wxzni9qmbj1ij")))) + (base32 "0w53hv3g7d5vv328x04wb57sa1lyv2h631c37csp1drfp7ghikd1")))) (arguments `(#:configure-flags (list (string-append "--with-sdkdir=" -- cgit v1.2.3 From 9b6410b96aed1f51a4eae9d123358a1e41f54374 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 29 Oct 2019 15:04:54 +0100 Subject: gnu: qbittorrent: Update to 4.1.9. * gnu/packages/bittorrent.scm (qbittorrent): Update to 4.1.9. --- gnu/packages/bittorrent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 416186409c..6b6998b323 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -416,7 +416,7 @@ desktops.") (define-public qbittorrent (package (name "qbittorrent") - (version "4.1.8") + (version "4.1.9") (source (origin (method git-fetch) @@ -425,7 +425,7 @@ desktops.") (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1mx59mazfmd5yaqdgb6cm8hr5sbp2xgzz3y3yipq1fwq85dj3r5w")))) + (base32 "044r3y3vvm2rqagmwlqlhvb4kkyqpkmpnlhv68hzkl3w5bvf8zl8")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 7ff157c16cc74d367978170815313a37fc0fff93 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 29 Oct 2019 12:58:10 +0100 Subject: gnu: Add guile-ffi-fftw. * gnu/packages/guile-xyz.scm (guile-ffi-fftw): New variable. --- gnu/packages/guile-xyz.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 3a55585251..d5c7325ba4 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -41,6 +41,7 @@ (define-module (gnu packages guile-xyz) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) + #:use-module (gnu packages algebra) #:use-module (gnu packages aspell) #:use-module (gnu packages autotools) #:use-module (gnu packages base) @@ -2608,3 +2609,47 @