summary refs log tree commit diff
path: root/pkgs/tools/misc/ostree/default.nix
diff options
context:
space:
mode:
authorUli Baum <xeji@cat3.de>2018-09-17 01:16:37 +0200
committerUli Baum <xeji@cat3.de>2018-09-17 02:51:07 +0200
commitd734328f5debc29c11b49ec4e9421be7e5d77d29 (patch)
treea427a1cad3d90a3d5778a0b834a514bfe3eeb0ea /pkgs/tools/misc/ostree/default.nix
parent536b49f46c08d2556d5778923b131f1c8eaf8984 (diff)
downloadnixpkgs-d734328f5debc29c11b49ec4e9421be7e5d77d29.tar
nixpkgs-d734328f5debc29c11b49ec4e9421be7e5d77d29.tar.gz
nixpkgs-d734328f5debc29c11b49ec4e9421be7e5d77d29.tar.bz2
nixpkgs-d734328f5debc29c11b49ec4e9421be7e5d77d29.tar.lz
nixpkgs-d734328f5debc29c11b49ec4e9421be7e5d77d29.tar.xz
nixpkgs-d734328f5debc29c11b49ec4e9421be7e5d77d29.tar.zst
nixpkgs-d734328f5debc29c11b49ec4e9421be7e5d77d29.zip
ostree: fix tests
- Workarounds for https://github.com/ostreedev/ostree/issues/1592
- Disable failing test-gpg-verify-result.test, see
  https://github.com/ostreedev/ostree/issues/1634
Diffstat (limited to 'pkgs/tools/misc/ostree/default.nix')
-rw-r--r--pkgs/tools/misc/ostree/default.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index 8eb9be97c22..3cbdd498aa7 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -32,6 +32,11 @@ in stdenv.mkDerivation {
   };
 
   patches = [
+    # Workarounds for https://github.com/ostreedev/ostree/issues/1592
+    ./fix-1592.patch
+    # Disable test-gpg-verify-result.test,
+    # https://github.com/ostreedev/ostree/issues/1634
+    ./disable-test-gpg-verify-result.patch
     # Tests access the helper using relative path
     # https://github.com/ostreedev/ostree/issues/1593
     (fetchpatch {
@@ -58,6 +63,7 @@ in stdenv.mkDerivation {
     cp --no-preserve=mode -r ${bsdiff-src} bsdiff
   '';
 
+
   preConfigure = ''
     env NOCONFIGURE=1 ./autogen.sh
   '';
@@ -75,6 +81,7 @@ in stdenv.mkDerivation {
     "installed_test_metadir=$(installedTests)/share/installed-tests/libostree"
   ];
 
+
   meta = with stdenv.lib; {
     description = "Git for operating system binaries";
     homepage = https://ostree.readthedocs.io/en/latest/;