mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: reprotest: Update to 0.7.14.
* gnu/packages/diffoscope (reprotest): Update to 0.7.14. * gnu/packages/patches/reprotest-support-guix.patch: Remove file. * gnu/local.mk [dist_patch_DATA]: Update accordingly.
This commit is contained in:
parent
03227eeb12
commit
04fd952d54
3 changed files with 2 additions and 83 deletions
|
@ -1389,7 +1389,6 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/readline-link-ncurses.patch \
|
%D%/packages/patches/readline-link-ncurses.patch \
|
||||||
%D%/packages/patches/readline-6.2-CVE-2014-2524.patch \
|
%D%/packages/patches/readline-6.2-CVE-2014-2524.patch \
|
||||||
%D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \
|
%D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \
|
||||||
%D%/packages/patches/reprotest-support-guix.patch \
|
|
||||||
%D%/packages/patches/ri-li-modernize_cpp.patch \
|
%D%/packages/patches/ri-li-modernize_cpp.patch \
|
||||||
%D%/packages/patches/ripperx-missing-file.patch \
|
%D%/packages/patches/ripperx-missing-file.patch \
|
||||||
%D%/packages/patches/rpcbind-CVE-2017-8779.patch \
|
%D%/packages/patches/rpcbind-CVE-2017-8779.patch \
|
||||||
|
|
|
@ -228,7 +228,7 @@ install.")
|
||||||
(define-public reprotest
|
(define-public reprotest
|
||||||
(package
|
(package
|
||||||
(name "reprotest")
|
(name "reprotest")
|
||||||
(version "0.7.13")
|
(version "0.7.14")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
|
@ -236,10 +236,9 @@ install.")
|
||||||
(url "https://salsa.debian.org/reproducible-builds/reprotest.git")
|
(url "https://salsa.debian.org/reproducible-builds/reprotest.git")
|
||||||
(commit version)))
|
(commit version)))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(patches (search-patches "reprotest-support-guix.patch"))
|
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0jj9sqxbdpypnc0y8md352wwzh1by6nyhmx5fwqnvrbznrng332f"))))
|
"12d07xq5zx5dfbsgakm6zcn7hgf0h9f5kvfjqkiyak4ix5aa6xkf"))))
|
||||||
(inputs
|
(inputs
|
||||||
`(("python-debian" ,python-debian)
|
`(("python-debian" ,python-debian)
|
||||||
("python-distro" ,python-distro)
|
("python-distro" ,python-distro)
|
||||||
|
|
|
@ -1,79 +0,0 @@
|
||||||
From 31bd4fe777cbff3ebca74115e5735a8b8f584fa7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
|
|
||||||
Date: Thu, 6 Feb 2020 23:17:58 -0800
|
|
||||||
Subject: [PATCH] Add support for GNU Guix.
|
|
||||||
|
|
||||||
---
|
|
||||||
reprotest/lib/adt_testbed.py | 2 ++
|
|
||||||
reprotest/lib/system_interface/guix.py | 39 ++++++++++++++++++++++++++
|
|
||||||
2 files changed, 41 insertions(+)
|
|
||||||
create mode 100644 reprotest/lib/system_interface/guix.py
|
|
||||||
|
|
||||||
diff --git a/reprotest/lib/adt_testbed.py b/reprotest/lib/adt_testbed.py
|
|
||||||
index ef704d6..60bf763 100644
|
|
||||||
--- a/reprotest/lib/adt_testbed.py
|
|
||||||
+++ b/reprotest/lib/adt_testbed.py
|
|
||||||
@@ -40,6 +40,7 @@ import urllib.parse
|
|
||||||
from reprotest.lib.system_interface.debian import DebianInterface
|
|
||||||
from reprotest.lib.system_interface.arch import ArchInterface
|
|
||||||
from reprotest.lib.system_interface.fedora import FedoraInterface
|
|
||||||
+from reprotest.lib.system_interface.guix import GuixInterface
|
|
||||||
from reprotest.lib import adtlog
|
|
||||||
from reprotest.lib import VirtSubproc
|
|
||||||
|
|
||||||
@@ -47,6 +48,7 @@ SYSTEM_INTERFACES = {
|
|
||||||
'debian': DebianInterface,
|
|
||||||
'arch': ArchInterface,
|
|
||||||
'fedora': FedoraInterface,
|
|
||||||
+ 'guix': GuixInterface,
|
|
||||||
}
|
|
||||||
|
|
||||||
timeouts = {
|
|
||||||
diff --git a/reprotest/lib/system_interface/guix.py b/reprotest/lib/system_interface/guix.py
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..2b06104
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/reprotest/lib/system_interface/guix.py
|
|
||||||
@@ -0,0 +1,39 @@
|
|
||||||
+# adt_testbed.py is part of autopkgtest
|
|
||||||
+# autopkgtest is a tool for testing Debian binary packages. The
|
|
||||||
+# system_interface module is an addition for reprotest to make
|
|
||||||
+# this module distro-agnostic
|
|
||||||
+#
|
|
||||||
+# autopkgtest is Copyright (C) 2006-2015 Canonical Ltd.
|
|
||||||
+# the system_interface module is Copyright (C) 2017 Santiago Torres-Arias
|
|
||||||
+#
|
|
||||||
+# This program 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 2 of the License, or
|
|
||||||
+# (at your option) any later version.
|
|
||||||
+#
|
|
||||||
+# This program 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 this program; if not, write to the Free Software
|
|
||||||
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
||||||
+#
|
|
||||||
+# See the file CREDITS for a full list of credits information (often
|
|
||||||
+# installed as /usr/share/doc/autopkgtest/CREDITS).
|
|
||||||
+import subprocess
|
|
||||||
+
|
|
||||||
+from . import SystemInterface
|
|
||||||
+
|
|
||||||
+class GuixInterface(SystemInterface):
|
|
||||||
+ """
|
|
||||||
+ SystemInterface implementation for GNU Guix hosts. Contains commands that
|
|
||||||
+ are specific to the GNU Guix toolchain.
|
|
||||||
+ """
|
|
||||||
+
|
|
||||||
+ def get_arch(self):
|
|
||||||
+ return ['uname', '-m']
|
|
||||||
+
|
|
||||||
+ def can_query_packages(self):
|
|
||||||
+ return False
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue