Modified from upstream commit: https://github.com/ankitects/anki/commit/ccd715013609133c55e83924734efa78abc03326 Fixes mpv argument syntax (support for old syntax removed in mpv 0.31): https://anki.tenderapp.com/discussions/ankidesktop/38186-mpvprocesserror-unable-to-start-process Necessary because we are currently unable to upgrade anki to the latest version in guix (NPM dependencies currently unpackaged). --- anki/mpv.py | 4 ++-- anki/sound.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/anki/mpv.py b/anki/mpv.py index f53d9d0..563fddc 100644 --- a/anki/mpv.py +++ b/anki/mpv.py @@ -104,9 +104,9 @@ class MPVBase: """ self.argv = [self.executable] self.argv += self.default_argv - self.argv += ["--input-ipc-server", self._sock_filename] + self.argv += ["--input-ipc-server="+self._sock_filename] if self.window_id is not None: - self.argv += ["--wid", str(self.window_id)] + self.argv += ["--wid="+str(self.window_id)] def _start_process(self): """Start the mpv process. diff --git a/anki/sound.py b/anki/sound.py index aa3431b..a5fce44 100644 --- a/anki/sound.py +++ b/anki/sound.py @@ -124,7 +124,6 @@ class MpvManager(MPV): def setMpvConfigBase(base): mpvConfPath = os.path.join(base, "mpv.conf") MpvManager.default_argv += [ - "--no-config", "--include="+mpvConfPath, ] -- 2.25.1 /a>diff
path: root/tests/guix-graph.sh
blob: 1ec99706fd0245d45b4c48ac639e0843f0273544 (about) (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
# GNU Guix --- Functional package management for GNU
# Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org>
#
# This file is part of GNU Guix.
#
# GNU Guix is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or (at
# your option) any later version.
#
# GNU Guix is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

#
# Test the 'guix graph' command-line utility.
#

tmpfile1="t-guix-graph1-$$"
tmpfile2="t-guix-graph2-$$"
trap 'rm -f "$tmpfile1" "$tmpfile2"' EXIT

guix graph --version

for package in guile-bootstrap coreutils python
do
    for graph in package bag-emerged bag bag-with-origins
    do
	guix graph -t "$graph" "$package" | grep "$package"
    done
done

guix build guile-bootstrap
guix graph -t references guile-bootstrap | grep guile-bootstrap

guix graph -e '(@ (gnu packages bootstrap) %bootstrap-guile)' \
    | grep guile-bootstrap

if guix graph -e +; then false; else true; fi

# Try passing store file names.

guix graph -t references guile-bootstrap > "$tmpfile1"
guix graph -t references `guix build guile-bootstrap` > "$tmpfile2"
cmp "$tmpfile1" "$tmpfile2"

# XXX: Filter the file names in the graph to work around the fact that we get
# a mixture of relative and absolute file names.
guix graph -t derivation coreutils > "$tmpfile1"
guix graph -t derivation `guix build -d coreutils` > "$tmpfile2"
cmp "$tmpfile1" "$tmpfile2"