mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
Merge branch 'master' into core-updates
This commit is contained in:
Mark H Weaver
commit
c0d7c1244a
18 changed files with 1452 additions and 98 deletions
101
CODE-OF-CONDUCT
101
CODE-OF-CONDUCT
|
|
@ -1,51 +1,78 @@
|
|||
Contributor Code of Conduct
|
||||
Contributor Covenant Code of Conduct
|
||||
|
||||
Note: In the sequel, "project" refers to GNU Guix, and "project
|
||||
maintainer(s)" refers to maintainer(s) of GNU Guix.
|
||||
|
||||
As contributors and maintainers of this project, and in the interest of
|
||||
fostering an open and welcoming community, we pledge to respect all
|
||||
people who contribute through reporting issues, posting feature
|
||||
requests, updating documentation, submitting pull requests or patches,
|
||||
and other activities.
|
||||
Our Pledge
|
||||
|
||||
In the interest of fostering an open and welcoming environment, we as
|
||||
contributors and maintainers pledge to making participation in our project and
|
||||
our community a harassment-free experience for everyone, regardless of age, body
|
||||
size, disability, ethnicity, gender identity and expression, level of experience,
|
||||
education, socio-economic status, nationality, personal appearance, race,
|
||||
religion, or sexual identity and orientation.
|
||||
|
||||
Our Standards
|
||||
|
||||
Examples of behavior that contributes to creating a positive environment
|
||||
include:
|
||||
|
||||
|
||||
* Using welcoming and inclusive language
|
||||
* Being respectful of differing viewpoints and experiences
|
||||
* Gracefully accepting constructive criticism
|
||||
* Focusing on what is best for the community
|
||||
* Showing empathy towards other community members
|
||||
|
||||
We are committed to making participation in this project a
|
||||
harassment-free experience for everyone, regardless of level of
|
||||
experience, gender, gender identity and expression, sexual orientation,
|
||||
disability, personal appearance, body size, race, ethnicity, age,
|
||||
religion, or nationality.
|
||||
|
||||
Examples of unacceptable behavior by participants include:
|
||||
|
||||
* The use of sexualized language or imagery
|
||||
* Personal attacks
|
||||
* Trolling or insulting/derogatory comments
|
||||
|
||||
* The use of sexualized language or imagery and unwelcome sexual attention or
|
||||
advances
|
||||
* Trolling, insulting/derogatory comments, and personal or political attacks
|
||||
* Public or private harassment
|
||||
* Publishing other's private information, such as physical or electronic
|
||||
addresses, without explicit permission
|
||||
* Other unethical or unprofessional conduct
|
||||
* Publishing others’ private information, such as a physical or electronic
|
||||
address, without explicit permission
|
||||
* Other conduct which could reasonably be considered inappropriate in a
|
||||
professional setting
|
||||
|
||||
Project maintainers have the right and responsibility to remove, edit,
|
||||
or reject comments, commits, code, wiki edits, issues, and other
|
||||
contributions that are not aligned to this Code of Conduct, or to ban
|
||||
temporarily or permanently any contributor for other behaviors that they
|
||||
deem inappropriate, threatening, offensive, or harmful.
|
||||
|
||||
By adopting this Code of Conduct, project maintainers commit themselves
|
||||
to fairly and consistently applying these principles to every aspect of
|
||||
managing this project. Project maintainers who do not follow or enforce
|
||||
the Code of Conduct may be permanently removed from the project team.
|
||||
Our Responsibilities
|
||||
|
||||
This Code of Conduct applies both within project spaces and in public
|
||||
spaces when an individual is representing the project or its community.
|
||||
Project maintainers are responsible for clarifying the standards of acceptable
|
||||
behavior and are expected to take appropriate and fair corrective action in
|
||||
response to any instances of unacceptable behavior.
|
||||
|
||||
Instances of abusive, harassing, or otherwise unacceptable behavior may
|
||||
be reported by contacting a project maintainer at guix-maintainers@gnu.org.
|
||||
All complaints will be reviewed and investigated and will
|
||||
result in a response that is deemed necessary and appropriate to the
|
||||
circumstances. Maintainers are obligated to maintain confidentiality
|
||||
with regard to the reporter of an incident.
|
||||
Project maintainers have the right and responsibility to remove, edit, or
|
||||
reject comments, commits, code, wiki edits, issues, and other contributions
|
||||
that are not aligned to this Code of Conduct, or to ban temporarily or
|
||||
permanently any contributor for other behaviors that they deem inappropriate,
|
||||
threatening, offensive, or harmful.
|
||||
|
||||
This Code of Conduct is adapted from the Contributor Covenant
|
||||
(http://contributor-covenant.org), version 1.3.0, available at
|
||||
http://contributor-covenant.org/version/1/3/0/
|
||||
Scope
|
||||
|
||||
This Code of Conduct applies both within project spaces and in public spaces
|
||||
when an individual is representing the project or its community. Examples of
|
||||
representing a project or community include using an official project e-mail
|
||||
address, posting via an official social media account, or acting as an appointed
|
||||
representative at an online or offline event. Representation of a project may be
|
||||
further defined and clarified by project maintainers.
|
||||
|
||||
Enforcement
|
||||
|
||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
||||
reported by contacting the project team at guix-maintainers@gnu.org. All
|
||||
complaints will be reviewed and investigated and will result in a response that
|
||||
is deemed necessary and appropriate to the circumstances. The project team is
|
||||
obligated to maintain confidentiality with regard to the reporter of an incident.
|
||||
Further details of specific enforcement policies may be posted separately.
|
||||
|
||||
Project maintainers who do not follow or enforce the Code of Conduct in good
|
||||
faith may face temporary or permanent repercussions as determined by other
|
||||
members of the project’s leadership.
|
||||
|
||||
Attribution
|
||||
|
||||
This Code of Conduct is adapted from the Contributor Covenant, version 1.4,
|
||||
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
|
||||
|
|
|
|||
|
|
@ -1105,6 +1105,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/steghide-fixes.patch \
|
||||
%D%/packages/patches/strace-kernel-4.16.patch \
|
||||
%D%/packages/patches/superlu-dist-scotchmetis.patch \
|
||||
%D%/packages/patches/swig-octave-patches.patch \
|
||||
%D%/packages/patches/swish-e-search.patch \
|
||||
%D%/packages/patches/swish-e-format-security.patch \
|
||||
%D%/packages/patches/synfigstudio-fix-ui-with-gtk3.patch \
|
||||
|
|
|
|||
|
|
@ -1953,7 +1953,7 @@ (define-public dstat
|
|||
(define-public thefuck
|
||||
(package
|
||||
(name "thefuck")
|
||||
(version "3.26")
|
||||
(version "3.27")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/nvbn/thefuck/archive/"
|
||||
|
|
@ -1961,7 +1961,7 @@ (define-public thefuck
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ddlf25ik97z34bcpc52xyfhlfm6a3hdi43l6cz4ggwcawdwvn1p"))
|
||||
"0my32n2x8x0f0wr8ql7qgk9qhb6ibv5b1rqs5b2r4nadv0gpiv96"))
|
||||
(patches (search-patches "thefuck-test-environ.patch"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
|
|
|
|||
|
|
@ -714,9 +714,10 @@ (define-public eigen
|
|||
;; but maintainers say it's a known issue and it's unsupported
|
||||
;; anyway, so just skip them.
|
||||
'(begin
|
||||
(substitute* "unsupported/CMakeLists.txt"
|
||||
(("add_subdirectory\\(test.*")
|
||||
"# Do not build the tests for unsupported features.\n"))
|
||||
(substitute* "CMakeLists.txt"
|
||||
(("add_subdirectory\\(unsupported\\)")
|
||||
"# Do not build the tests for unsupported features.\n")
|
||||
;; Work around
|
||||
;; <http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1114>.
|
||||
(("\"include/eigen3\"")
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
;;; Copyright © 2016, 2017 Theodoros Foradis <theodoros@foradis.org>
|
||||
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
|
||||
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;;
|
||||
|
|
@ -107,17 +107,17 @@ (define-public httpfs2
|
|||
(define-public disorderfs
|
||||
(package
|
||||
(name "disorderfs")
|
||||
(version "0.5.2")
|
||||
(version "0.5.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ReproducibleBuilds/disorderfs.git")
|
||||
(commit "0.5.2")))
|
||||
(url "https://salsa.debian.org/reproducible-builds/disorderfs.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1j028dq3d4m64mn9xmfamcnnc7i2drmra4pdmxdmqdsi8p7yj4sv"))))
|
||||
"1nmhfvxpvz3xsfxl9wqnh6r2l5m7hjq6n0vpblsl5xdcvwaqcf50"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ (define-module (gnu packages freedesktop)
|
|||
(define-public xdg-utils
|
||||
(package
|
||||
(name "xdg-utils")
|
||||
(version "1.1.2")
|
||||
(version "1.1.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -91,7 +91,7 @@ (define-public xdg-utils
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1k4b4m3aiyqn9k12a0ihcdahzlspl3zhskmm1d7228dvqvi546cm"))))
|
||||
"1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("docbook-xsl" ,docbook-xsl)
|
||||
|
|
|
|||
|
|
@ -396,7 +396,7 @@ (define-public python2-xsge
|
|||
(define-public tiled
|
||||
(package
|
||||
(name "tiled")
|
||||
(version "1.1.4")
|
||||
(version "1.1.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/bjorn/tiled/archive/v"
|
||||
|
|
@ -404,7 +404,7 @@ (define-public tiled
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0xb3zwcdk7khdrza6spl02g5n2xbij6nbszv8vi27vagjnmz1wxh"))))
|
||||
"1zrq1nhb50mwqzw3fln6vj49ljddil1v7yby3ahjbcm94s25ll1y"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("qtbase" ,qtbase)
|
||||
|
|
|
|||
|
|
@ -1471,3 +1471,153 @@ (define-public go-github-com-tevino-abool
|
|||
(description "This package is atomic boolean library for Go code,
|
||||
optimized for performance yet simple to use.")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public go-github-com-urfave-cli
|
||||
(let ((commit "cfb38830724cc34fedffe9a2a29fb54fa9169cd1")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-github-com-urfave-cli")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/urfave/cli.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "github.com/urfave/cli"))
|
||||
(home-page "https://github.com/urfave/cli")
|
||||
(synopsis "Library for building command-line interfaces in Go")
|
||||
(description "This package provides a library for building command-line
|
||||
interfaces in Go.")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public go-github-com-blang-semver
|
||||
(let ((commit "60ec3488bfea7cca02b021d106d9911120d25fe9")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-github-com-blang-semver")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/blang/semver.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"19pli07y5592g4dyjyj0jq5rn548vc3fz0qg3624vm1j5828p1c2"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "github.com/blang/semver"))
|
||||
(home-page "https://github.com/blang/semver")
|
||||
(synopsis "Semantic versioning library written in Go")
|
||||
(description "Semver is a library for Semantic versioning written in Go.")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public go-github-com-emicklei-go-restful
|
||||
(let ((commit "89ef8af493ab468a45a42bb0d89a06fccdd2fb22")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-github-com-emicklei-go-restful")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/emicklei/go-restful.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0rrlfcfq80fkxifpih6bq31vavb5mf4530xz51pp9pq1mn2fzjfh"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "github.com/emicklei/go-restful"))
|
||||
(home-page "https://github.com/emicklei/go-restful")
|
||||
(synopsis "Build REST-style web services using Go")
|
||||
(description "This package provides @code{go-restful}, which helps
|
||||
developers to use @code{http} methods explicitly and in a way that's consistent
|
||||
with the HTTP protocol definition.")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public go-github-com-google-cadvisor
|
||||
(let ((commit "2ed7198f77395ee9a172878a0a7ab92ab59a2cfd")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-github-com-google-cadvisor")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/google/cadvisor.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1w8p345z5j0gk3yiq5ah0znd5lfh348p2s624k5r10drz04p3f55"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "github.com/google/cadvisor"))
|
||||
(home-page "https://github.com/google/cadvisor")
|
||||
(synopsis "Analyze resource usage of running containers")
|
||||
(description "The package provides @code{cadvisor}, which provides
|
||||
information about the resource usage and preformance characteristics of running
|
||||
containers.")
|
||||
(license license:asl2.0))))
|
||||
|
||||
(define-public go-github-com-google-gofuzz
|
||||
(let ((commit "fd52762d25a41827db7ef64c43756fd4b9f7e382")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-github-com-google-gofuzz")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/google/gofuzz.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1yxmmr73h0lq7ryf3q9a7pcm2x5xrg4d5bxkq8n5pxwxwyq26kw8"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "github.com/google/gofuzz"))
|
||||
(home-page "https://github.com/google/gofuzz")
|
||||
(synopsis "Fuzz testing library for Go")
|
||||
(description "Gofuzz is a library for populationg Go objects with random
|
||||
values for the purpose of fuzz testing.")
|
||||
(license license:asl2.0))))
|
||||
|
||||
(define-public go-github-com-gorilla-context
|
||||
(let ((commit "08b5f424b9271eedf6f9f0ce86cb9396ed337a42")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-github-com-gorilla-context")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/gorilla/context.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "github.com/gorilla/context"))
|
||||
(home-page "https://github.com/gorilla/context")
|
||||
(synopsis "Go registry for request variables")
|
||||
(description "This package provides @code{gorilla/context}, which is a general purpose registry for global request variables in the Go programming language.")
|
||||
(license license:bsd-3))))
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Kei Kebreau <kkebreau@posteo.net>
|
||||
;;; Copyright © 2018 Mark Meyer <mark@ofosos.org>
|
||||
;;; Copyright © 2018 Ben Woodcroft <donttrustben@gmail.com>
|
||||
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
|
||||
|
|
@ -36,6 +37,7 @@ (define-module (gnu packages machine-learning)
|
|||
#:use-module (guix build-system r)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages algebra)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages check)
|
||||
|
|
@ -366,7 +368,7 @@ (define-public randomjungle
|
|||
(define-public shogun
|
||||
(package
|
||||
(name "shogun")
|
||||
(version "4.0.0")
|
||||
(version "6.1.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -376,7 +378,7 @@ (define-public shogun
|
|||
"/sources/shogun-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"159nlijnb7mnrv9za80wnm1shwvy45hgrqzn51hxy7gw4z6d6fdb"))
|
||||
"1rn9skm3nw6hr7mr3lgp2gfqhi7ii0lyxck7qmqnf8avq349s5jp"))
|
||||
(modules '((guix build utils)
|
||||
(ice-9 rdelim)))
|
||||
(snippet
|
||||
|
|
@ -408,8 +410,20 @@ (define (delete-ifdefs file)
|
|||
(and skipping? (not skip-next?)))
|
||||
(display line out))
|
||||
(loop (read-line in 'concat) skip-next?)))))))
|
||||
(for-each delete-ifdefs (find-files "src/shogun/kernel/"
|
||||
"^Kernel\\.(cpp|h)"))
|
||||
(for-each delete-ifdefs
|
||||
(append
|
||||
(find-files "src/shogun/classifier/mkl"
|
||||
"^MKLClassification\\.cpp")
|
||||
(find-files "src/shogun/classifier/svm"
|
||||
"^SVMLightOneClass\\.(cpp|h)")
|
||||
(find-files "src/shogun/multiclass"
|
||||
"^ScatterSVM\\.(cpp|h)")
|
||||
(find-files "src/shogun/kernel/"
|
||||
"^(Kernel|CombinedKernel|ProductKernel)\\.(cpp|h)")
|
||||
(find-files "src/shogun/regression/svr"
|
||||
"^(MKLRegression|SVRLight)\\.(cpp|h)")
|
||||
(find-files "src/shogun/transfer/domain_adaptation"
|
||||
"^DomainAdaptationSVM\\.(cpp|h)")))
|
||||
#t))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
|
|
@ -423,62 +437,59 @@ (define (delete-ifdefs file)
|
|||
"applications/easysvm/data"
|
||||
"applications/msplicer/data"
|
||||
"applications/ocr/data"
|
||||
"examples/documented/data"
|
||||
"examples/documented/matlab_static"
|
||||
"examples/documented/octave_static"
|
||||
"examples/undocumented/data"
|
||||
"examples/undocumented/matlab_static"
|
||||
"examples/undocumented/octave_static"
|
||||
"tests/integration/data"
|
||||
"tests/integration/matlab_static"
|
||||
"tests/integration/octave_static"
|
||||
"tests/integration/python_modular/tests"))
|
||||
"examples/meta/data"
|
||||
"examples/undocumented/data"))
|
||||
#t))
|
||||
(add-after 'unpack 'change-R-target-path
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(substitute* '("src/interfaces/r_modular/CMakeLists.txt"
|
||||
"src/interfaces/r_static/CMakeLists.txt"
|
||||
"examples/undocumented/r_modular/CMakeLists.txt")
|
||||
(substitute* '("src/interfaces/r/CMakeLists.txt"
|
||||
"examples/meta/r/CMakeLists.txt")
|
||||
(("\\$\\{R_COMPONENT_LIB_PATH\\}")
|
||||
(string-append (assoc-ref outputs "out")
|
||||
"/lib/R/library/")))
|
||||
#t))
|
||||
(add-after 'unpack 'fix-octave-modules
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(substitute* '("src/interfaces/octave_modular/CMakeLists.txt"
|
||||
"src/interfaces/octave_static/CMakeLists.txt")
|
||||
(substitute* "src/interfaces/octave/CMakeLists.txt"
|
||||
(("^include_directories\\(\\$\\{OCTAVE_INCLUDE_DIRS\\}")
|
||||
"include_directories(${OCTAVE_INCLUDE_DIRS} ${OCTAVE_INCLUDE_DIRS}/octave"))
|
||||
|
||||
;; change target directory
|
||||
(substitute* "src/interfaces/octave_modular/CMakeLists.txt"
|
||||
"include_directories(${OCTAVE_INCLUDE_DIRS} ${OCTAVE_INCLUDE_DIRS}/octave")
|
||||
;; change target directory
|
||||
(("\\$\\{OCTAVE_OCT_LOCAL_API_FILE_DIR\\}")
|
||||
(string-append (assoc-ref outputs "out")
|
||||
"/share/octave/packages")))
|
||||
(substitute* '("src/interfaces/octave/swig_typemaps.i"
|
||||
"src/interfaces/octave/sg_print_functions.cpp")
|
||||
;; "octave/config.h" and "octave/oct-obj.h" deprecated in Octave.
|
||||
(("octave/config\\.h") "octave/octave-config.h")
|
||||
(("octave/oct-obj.h") "octave/ovl.h"))
|
||||
#t))
|
||||
(add-after 'unpack 'move-rxcpp
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((rxcpp-dir "shogun/third-party/rxcpp"))
|
||||
(mkdir-p rxcpp-dir)
|
||||
(install-file (assoc-ref inputs "rxcpp") rxcpp-dir)
|
||||
#t)))
|
||||
(add-before 'build 'set-HOME
|
||||
;; $HOME needs to be set at some point during the build phase
|
||||
(lambda _ (setenv "HOME" "/tmp") #t)))
|
||||
#:configure-flags
|
||||
(list "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE"
|
||||
"-DUSE_SVMLIGHT=OFF" ;disable proprietary SVMLIGHT
|
||||
;;"-DJavaModular=ON" ;requires unpackaged jblas
|
||||
;;"-DRubyModular=ON" ;requires unpackaged ruby-narray
|
||||
;;"-DPerlModular=ON" ;"FindPerlLibs" does not exist
|
||||
;;"-DLuaModular=ON" ;fails because lua doesn't build pkgconfig file
|
||||
"-DOctaveModular=ON"
|
||||
"-DOctaveStatic=ON"
|
||||
"-DPythonModular=ON"
|
||||
"-DPythonStatic=ON"
|
||||
"-DRModular=ON"
|
||||
"-DRStatic=ON"
|
||||
"-DCmdLineStatic=ON")))
|
||||
"-DBUILD_META_EXAMPLES=OFF" ;requires unpackaged ctags
|
||||
;;"-DINTERFACE_JAVA=ON" ;requires unpackaged jblas
|
||||
;;"-DINTERFACE_RUBY=ON" ;requires unpackaged ruby-narray
|
||||
;;"-DINTERFACE_PERL=ON" ;"FindPerlLibs" does not exist
|
||||
;;"-DINTERFACE_LUA=ON" ;fails because lua doesn't build pkgconfig file
|
||||
"-DINTERFACE_OCTAVE=ON"
|
||||
"-DINTERFACE_PYTHON=ON"
|
||||
"-DINTERFACE_R=ON")))
|
||||
(inputs
|
||||
`(("python" ,python)
|
||||
("numpy" ,python-numpy)
|
||||
("r-minimal" ,r-minimal)
|
||||
("octave" ,octave)
|
||||
("swig" ,swig)
|
||||
("eigen" ,eigen)
|
||||
("hdf5" ,hdf5)
|
||||
("atlas" ,atlas)
|
||||
("arpack" ,arpack-ng)
|
||||
|
|
@ -488,7 +499,8 @@ (define (delete-ifdefs file)
|
|||
("lzo" ,lzo)
|
||||
("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("rxcpp" ,rxcpp)))
|
||||
;; Non-portable SSE instructions are used so building fails on platforms
|
||||
;; other than x86_64.
|
||||
(supported-systems '("x86_64-linux"))
|
||||
|
|
@ -502,6 +514,47 @@ (define (delete-ifdefs file)
|
|||
in terms of new algorithms.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public rxcpp
|
||||
(package
|
||||
(name "rxcpp")
|
||||
(version "4.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/ReactiveX/RxCpp/archive/v"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0y2isr8dy2n1yjr9c5570kpc9lvdlch6jv0jvw000amwn5d3krsh"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'remove-werror
|
||||
(lambda _
|
||||
(substitute* (find-files ".")
|
||||
(("-Werror") ""))
|
||||
#t))
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(invoke "ctest"))))))
|
||||
(native-inputs
|
||||
`(("catch" ,catch-framework)))
|
||||
(home-page "http://reactivex.io/")
|
||||
(synopsis "Reactive Extensions for C++")
|
||||
(description
|
||||
"The Reactive Extensions for C++ (RxCpp) is a library of algorithms for
|
||||
values-distributed-in-time. ReactiveX is a library for composing asynchronous
|
||||
and event-based programs by using observable sequences.
|
||||
|
||||
It extends the observer pattern to support sequences of data and/or events and
|
||||
adds operators that allow you to compose sequences together declaratively while
|
||||
abstracting away concerns about things like low-level threading,
|
||||
synchronization, thread-safety, concurrent data structures, and non-blocking
|
||||
I/O.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public r-adaptivesparsity
|
||||
(package
|
||||
(name "r-adaptivesparsity")
|
||||
|
|
|
|||
|
|
@ -2497,7 +2497,7 @@ (define-public afew
|
|||
(define-public pan
|
||||
(package
|
||||
(name "pan")
|
||||
(version "0.144")
|
||||
(version "0.145")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -2505,7 +2505,7 @@ (define-public pan
|
|||
version "/source/" name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0l07y75z8jxhbmfv28slw81gjncs7i89x7fq44zif7xhq5vy7yli"))))
|
||||
"1b4wamv33hprghcjk903bpvnd233yxyrm18qnh13alc8h1553nk8"))))
|
||||
(arguments
|
||||
`(#:configure-flags '("--with-gtk3" "--with-gtkspell" "--with-gnutls"
|
||||
"--enable-libnotify" "--enable-manual"
|
||||
|
|
|
|||
|
|
@ -1337,7 +1337,7 @@ (define-public ceres
|
|||
(define-public octave
|
||||
(package
|
||||
(name "octave")
|
||||
(version "4.2.2")
|
||||
(version "4.4.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -1345,7 +1345,7 @@ (define-public octave
|
|||
version ".tar.lz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0pkkz1vazsh7ipffb09q0nc2jgx6q27pkkngygjij6jrpcly5zsp"))))
|
||||
"0nm766737gbkq9wqry54a026k3dg7rb1065kngfpwgjz8b544xbp"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("lapack" ,lapack)
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ (define-public libmpdclient
|
|||
(define-public mpd
|
||||
(package
|
||||
(name "mpd")
|
||||
(version "0.20.19")
|
||||
(version "0.20.20")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
|
@ -97,7 +97,7 @@ (define-public mpd
|
|||
"/mpd-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hsng4mnaz1jr2s3fy3q78vf2f6102lwphjdls7qln0pj8dyzk81"))))
|
||||
"111m4z7zaz60xfxvz5xkxs1al4vzb8g2wwp7kmj65pvww335ir59"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
|||
|
|
@ -546,7 +546,7 @@ (define-public whois
|
|||
(define-public wireshark
|
||||
(package
|
||||
(name "wireshark")
|
||||
(version "2.6.0")
|
||||
(version "2.6.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -554,7 +554,7 @@ (define-public wireshark
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0zqip4ai18iar7sgialc3jmpng1yxxy4i9bphbaig23ss80py73i"))))
|
||||
"126dvd6myjbxjr69dy9vzzdda2lmjy1wwwc6gcs5djb46jy5nvmb"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("c-ares" ,c-ares)
|
||||
("glib" ,glib)
|
||||
|
|
|
|||
1119
gnu/packages/patches/swig-octave-patches.patch
Normal file
1119
gnu/packages/patches/swig-octave-patches.patch
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -22,6 +22,7 @@ (define-module (gnu packages swig)
|
|||
#:use-module (guix download)
|
||||
#:use-module (guix licenses)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages pcre)
|
||||
#:use-module (gnu packages guile)
|
||||
#:use-module (gnu packages boost)
|
||||
|
|
@ -39,7 +40,9 @@ (define-public swig
|
|||
name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0kf99ygrjs5616gsqhz1l7bib3a12izmxi7g48bwblbymr3z9ybw"))))
|
||||
"0kf99ygrjs5616gsqhz1l7bib3a12izmxi7g48bwblbymr3z9ybw"))
|
||||
(patches
|
||||
(search-patches "swig-octave-patches.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
|
|
|||
|
|
@ -142,14 +142,14 @@ (define-public git
|
|||
(name "git")
|
||||
;; XXX When updating Git, check if the special 'git:src' input to cgit needs
|
||||
;; to be updated as well.
|
||||
(version "2.17.0")
|
||||
(version "2.17.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kernel.org/software/scm/git/git-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ismz7nsz8dgjmk782xr9s0mr2qh06f72pdcgbxfmnw1bvlya5p9"))))
|
||||
"0pm6bdnrrm165k3krnazxcxadifk2gqi30awlbcf9fism1x6w4vr"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("native-perl" ,perl)
|
||||
|
|
@ -162,7 +162,7 @@ (define-public git
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"09rpjj0m97h5lpzpwk47m6xsz9gb8wqf1s3dfqma3mwav2pb3njb"))))))
|
||||
"0m7grrwsqaihdgcgaicxiy4rlqjpa75n5wl6hi2qhi33xa34gmc3"))))))
|
||||
(inputs
|
||||
`(("curl" ,curl)
|
||||
("expat" ,expat)
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
|
||||
(define-module (gnu system vm)
|
||||
#:use-module (guix config)
|
||||
#:use-module (guix docker)
|
||||
#:use-module (guix store)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix derivations)
|
||||
|
|
|
|||
Loading…
Reference in a new issue