nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into staging

This commit is contained in:
Ricardo Wurmus 2019-01-23 12:08:54 +01:00
parent 5aaef5c5de b2c08402f5
commit 2b965485e2
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
2 changed files with 98 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
gnu/packages/emacs-xyz.scm
View File

@ -203,14 +203,14 @@ when typing parentheses directly or commenting out code line by line.")
(name "emacs-git-modes") (name "emacs-git-modes")
(version "1.2.8") (version "1.2.8")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append (uri (git-reference
"https://github.com/magit/git-modes/archive/" (url "https://github.com/magit/git-modes")
version ".tar.gz")) (commit version)))
(file-name (string-append name "-" version ".tar.gz")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0h49f68yn0q4lg054adqii4qja1z2pzybm7nf4kvpq7fzjrzgv1q")))) "08hy7rbfazs6grkpk54i82bz0i0c74zcjk96cip8970h6jn3mj72"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/magit/git-modes") (home-page "https://github.com/magit/git-modes")
(synopsis "Emacs major modes for Git configuration files") (synopsis "Emacs major modes for Git configuration files")
@ -250,15 +250,16 @@ on stdout instead of using a socket as the Emacsclient does.")
(define-public emacs-magit (define-public emacs-magit
(package (package
(name "emacs-magit") (name "emacs-magit")
(version "2.13.0") (version "2.13.1")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append (uri (git-reference
"https://github.com/magit/magit/releases/download/" (url "https://github.com/magit/magit")
version "/magit-" version ".tar.gz")) (commit version)))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1ygaah3dd3nxpyd17297xgvdcgr7pgzzwlmpnmchki0kiwgg3sbc")))) "1kmjjcvhcb21qi6kmrlhf92ync8va5l41n9ban8kj25h7dbqyiym"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("texinfo" ,texinfo) (native-inputs `(("texinfo" ,texinfo)
("emacs" ,emacs-minimal))) ("emacs" ,emacs-minimal)))
@ -268,6 +269,8 @@ on stdout instead of using a socket as the Emacsclient does.")
(propagated-inputs (propagated-inputs
`(("dash" ,emacs-dash) `(("dash" ,emacs-dash)
("ghub" ,emacs-ghub) ("ghub" ,emacs-ghub)
("graphql" ,emacs-graphql)
("treepy" ,emacs-treepy)
("magit-popup" ,emacs-magit-popup) ("magit-popup" ,emacs-magit-popup)
("with-editor" ,emacs-with-editor))) ("with-editor" ,emacs-with-editor)))
(arguments (arguments
@ -286,6 +289,14 @@ on stdout instead of using a socket as the Emacsclient does.")
(assoc-ref %build-inputs "ghub") (assoc-ref %build-inputs "ghub")
"/share/emacs/site-lisp/guix.d/ghub-" "/share/emacs/site-lisp/guix.d/ghub-"
,(package-version emacs-ghub)) ,(package-version emacs-ghub))
(string-append "GRAPHQL_DIR="
(assoc-ref %build-inputs "graphql")
"/share/emacs/site-lisp/guix.d/graphql-"
,(package-version emacs-graphql))
(string-append "TREEPY_DIR="
(assoc-ref %build-inputs "treepy")
"/share/emacs/site-lisp/guix.d/treepy-"
,(package-version emacs-treepy))
(string-append "MAGIT_POPUP_DIR=" (string-append "MAGIT_POPUP_DIR="
(assoc-ref %build-inputs "magit-popup") (assoc-ref %build-inputs "magit-popup")
"/share/emacs/site-lisp/guix.d/magit-popup-" "/share/emacs/site-lisp/guix.d/magit-popup-"
@ -321,23 +332,25 @@ operations.")
(define-public emacs-magit-svn (define-public emacs-magit-svn
(package (package
(name "emacs-magit-svn") (name "emacs-magit-svn")
(version "2.2.0") (version "2.2.1")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append (uri (git-reference
"https://github.com/magit/magit-svn/archive/" (url "https://github.com/magit/magit-svn")
version ".tar.gz")) (commit version)))
(file-name (string-append name "-" version ".tar.gz")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1c3n377v436zaxamlsz04y1ahdhp96x1vd43zaryv4y10m02ba47")))) "01kcsc53q3mbhgjssjpby7ypnhqsr48rkl1xz3ahaypmlp929gl9"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(native-inputs `(("emacs" ,emacs-minimal) (native-inputs `(("emacs" ,emacs-minimal)))
("tar" ,tar)
("gzip" ,gzip)))
(propagated-inputs `(("dash" ,emacs-dash) (propagated-inputs `(("dash" ,emacs-dash)
("ghub" ,emacs-ghub)
("graphql" ,emacs-graphql)
("treepy" ,emacs-treepy)
("with-editor" ,emacs-with-editor) ("with-editor" ,emacs-with-editor)
("magit" ,emacs-magit))) ("magit" ,emacs-magit)
("magit-popup" ,emacs-magit-popup)))
(arguments (arguments
`(#:modules ((guix build utils) `(#:modules ((guix build utils)
(guix build emacs-utils)) (guix build emacs-utils))
@ -347,33 +360,40 @@ operations.")
(use-modules (guix build utils) (use-modules (guix build utils)
(guix build emacs-utils)) (guix build emacs-utils))
(let* ((tar (string-append (assoc-ref %build-inputs "tar") (let ((emacs (string-append (assoc-ref %build-inputs "emacs")
"/bin/tar")) "/bin/emacs"))
(PATH (string-append (assoc-ref %build-inputs "gzip") (magit (string-append (assoc-ref %build-inputs "magit")
"/bin")) "/share/emacs/site-lisp"))
(emacs (string-append (assoc-ref %build-inputs "emacs") (magit-popup (string-append (assoc-ref %build-inputs "magit-popup")
"/bin/emacs")) "/share/emacs/site-lisp/guix.d/magit-popup-"
(magit (string-append (assoc-ref %build-inputs "magit") ,(package-version emacs-magit-popup)))
"/share/emacs/site-lisp")) (ghub (string-append (assoc-ref %build-inputs "ghub")
(dash (string-append (assoc-ref %build-inputs "dash") "/share/emacs/site-lisp/guix.d/ghub-"
"/share/emacs/site-lisp/guix.d/dash-" ,(package-version emacs-ghub)))
,(package-version emacs-dash))) (graphql (string-append (assoc-ref %build-inputs "graphql")
(with-editor (string-append (assoc-ref %build-inputs "with-editor") "/share/emacs/site-lisp/guix.d/graphql-"
"/share/emacs/site-lisp/guix.d/with-editor-" ,(package-version emacs-graphql)))
,(package-version emacs-with-editor))) (treepy (string-append (assoc-ref %build-inputs "treepy")
(source (assoc-ref %build-inputs "source")) "/share/emacs/site-lisp/guix.d/treepy-"
(lisp-dir (string-append %output "/share/emacs/site-lisp"))) ,(package-version emacs-treepy)))
(setenv "PATH" PATH) (dash (string-append (assoc-ref %build-inputs "dash")
(invoke tar "xvf" source) "/share/emacs/site-lisp/guix.d/dash-"
,(package-version emacs-dash)))
(with-editor (string-append (assoc-ref %build-inputs "with-editor")
"/share/emacs/site-lisp/guix.d/with-editor-"
,(package-version emacs-with-editor)))
(source (assoc-ref %build-inputs "source"))
(lisp-dir (string-append %output "/share/emacs/site-lisp")))
(install-file (string-append "magit-svn-" ,version "/magit-svn.el") (install-file (string-append source "/magit-svn.el")
lisp-dir) lisp-dir)
(with-directory-excursion lisp-dir (with-directory-excursion lisp-dir
(parameterize ((%emacs emacs)) (parameterize ((%emacs emacs))
(emacs-generate-autoloads ,name lisp-dir) (emacs-generate-autoloads ,name lisp-dir)
(setenv "EMACSLOADPATH" (setenv "EMACSLOADPATH"
(string-append ":" magit ":" dash ":" with-editor)) (string-append ":" magit ":" magit-popup ":" ghub ":"
":" graphql ":" treepy ":" dash ":" with-editor))
(emacs-batch-eval '(byte-compile-file "magit-svn.el")))) (emacs-batch-eval '(byte-compile-file "magit-svn.el"))))
#t)))) #t))))
(home-page "https://github.com/magit/magit-svn") (home-page "https://github.com/magit/magit-svn")
@ -474,16 +494,16 @@ deliver data to mobile and web apps.")
(define-public emacs-ghub (define-public emacs-ghub
(package (package
(name "emacs-ghub") (name "emacs-ghub")
(version "2.0.1") (version "3.2.0")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append (uri (git-reference
"https://github.com/magit/ghub/archive/v" (url "https://github.com/magit/ghub")
version ".tar.gz")) (commit (string-append "v" version))))
(file-name (string-append name "-" version ".tar.gz")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0d0qj5r1bm2aidi61rigrdaycxnyb7y1ivb3h8rpvvapsf8sk7z0")))) "0lp52qygyavddl1lrgsyb6mq7hcf9h89dy2pzya3mb2va49f0vvl"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -493,13 +513,17 @@ deliver data to mobile and web apps.")
(invoke "make" "info")))))) (invoke "make" "info"))))))
(native-inputs (native-inputs
`(("texinfo" ,texinfo))) `(("texinfo" ,texinfo)))
(propagated-inputs
`(("dash" ,emacs-dash)
("graphql" ,emacs-graphql)
("treepy" ,emacs-treepy)))
(home-page "https://github.com/magit/ghub") (home-page "https://github.com/magit/ghub")
(synopsis "Emacs client library for Github API and Gitlab API") (synopsis "Emacs client libraries for the APIs of various Git forges")
(description (description
"This package provides 2 files: @file{ghub.el} and @file{glab.el}, "Ghub provides basic support for using the APIs of various Git forges from
which are the libraries that provide basic support for using the Github and Emacs packages. It supports the REST APIs of Github, Github GraphQL, Gitlab,
Gitlab APIs from Emacs packages. It abstracts access to API resources using Gitea, Gogs and Bitbucket. It abstracts access to API resources using only a
only a handful of functions that are not resource-specific.") handful of functions that are not resource-specific.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-scribble-mode (define-public emacs-scribble-mode
@ -534,13 +558,13 @@ for editing Racket's Scribble documentation syntax in Emacs.")
(name "emacs-haskell-mode") (name "emacs-haskell-mode")
(version "16.1") (version "16.1")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(file-name (string-append name "-" version ".tar.gz")) (uri (git-reference
(uri (string-append (url "https://github.com/haskell/haskell-mode")
"https://github.com/haskell/haskell-mode/archive/v" (commit (string-append "v" version))))
version ".tar.gz")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0g6lcjw7lcgavv3yrd8xjcyqgfyjl787y32r1z14amw2f009m78h")) (base32 "1qk36y0v9fzass6785il65c6wb5cfj4ihhwkvgnzmbafpa8p4dvq"))
(patches (patches
(search-patches ; backport test failure fixes (search-patches ; backport test failure fixes
"haskell-mode-unused-variables.patch" "haskell-mode-unused-variables.patch"
@ -997,13 +1021,14 @@ light user interface.")
(version "0.2.5") (version "0.2.5")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/momomo5717/emms-mode-line-cycle" (uri (git-reference
"/archive/" version ".tar.gz")) (url "https://github.com/momomo5717/emms-mode-line-cycle")
(file-name (string-append name "-" version ".tar.gz")) (commit version)))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0ifszi930pnaxk1x8pcydmvnp06868gc7nfx14q17zbajbx735k6")))) "0q80f0plch6k4lhs8c9qm3mfycfbp3kn5sjrk9zxgxwnn901y9mp"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emms" ,emacs-emms))) `(("emms" ,emacs-emms)))

14
gnu/packages/wine.scm
View File

@ -71,7 +71,7 @@
(define-public wine (define-public wine
(package (package
(name "wine") (name "wine")
(version "3.0.4") (version "4.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://dl.winehq.org/wine/source/" (uri (string-append "https://dl.winehq.org/wine/source/"
@ -79,7 +79,7 @@
"/wine-" version ".tar.xz")) "/wine-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"037vlrk80lagy362w7500i2ldwvdwsadrknajzi67cvxpvnqhnnl")))) "0k8d90mgjzv8vjspmnxzr3i5mbccxnbr9hf03q1bpf5jjppcsdk7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
@ -122,8 +122,10 @@
("ncurses" ,ncurses) ("ncurses" ,ncurses)
("openal" ,openal) ("openal" ,openal)
("pulseaudio" ,pulseaudio) ("pulseaudio" ,pulseaudio)
("sdl2" ,sdl2)
("unixodbc" ,unixodbc) ("unixodbc" ,unixodbc)
("v4l-utils" ,v4l-utils) ("v4l-utils" ,v4l-utils)
("vulkan-loader" ,vulkan-loader)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments
`(;; Force a 32-bit build targeting a similar architecture, i.e.: `(;; Force a 32-bit build targeting a similar architecture, i.e.:
@ -225,7 +227,7 @@ integrate Windows applications into your desktop.")
(define-public wine-staging-patchset-data (define-public wine-staging-patchset-data
(package (package
(name "wine-staging-patchset-data") (name "wine-staging-patchset-data")
(version "4.0-rc7") (version "4.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -235,7 +237,7 @@ integrate Windows applications into your desktop.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"16mfsa0hq7nw5ad1bsr4cn03avjdzgl8j07n5f26idk3zhlzym9d")))) "1xfbmpjvzkgjg95x5d36raz3hp0qcdaim0n5hw9im0xjnwb83am9"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(native-inputs (native-inputs
`(("bash" ,bash) `(("bash" ,bash)
@ -281,17 +283,15 @@ integrate Windows applications into your desktop.")
(file-name (string-append name "-" version ".tar.xz")) (file-name (string-append name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1myq6707ba5p3bh7qr6k86rpkrpdi31py3v3n96bg184xs7h99yj")))) "0k8d90mgjzv8vjspmnxzr3i5mbccxnbr9hf03q1bpf5jjppcsdk7"))))
(inputs `(("autoconf" ,autoconf) ; for autoreconf (inputs `(("autoconf" ,autoconf) ; for autoreconf
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("libva" ,libva) ("libva" ,libva)
("mesa" ,mesa) ("mesa" ,mesa)
("python" ,python) ("python" ,python)
("sdl2" ,sdl2)
("util-linux" ,util-linux) ; for hexdump ("util-linux" ,util-linux) ; for hexdump
("vkd3d" ,vkd3d) ("vkd3d" ,vkd3d)
("vulkan-loader" ,vulkan-loader)
("wine-staging-patchset-data" ,wine-staging-patchset-data) ("wine-staging-patchset-data" ,wine-staging-patchset-data)
,@(package-inputs wine))) ,@(package-inputs wine)))
(arguments (arguments