fwup: 1.8.3 -> 1.8.4

This commit is contained in:
Fabian Affolter 2021-07-09 14:08:05 +02:00 committed by Jonathan Ringer
parent 24a688436a
commit fd333014ff
2 changed files with 3 additions and 31 deletions

View file

@ -21,17 +21,15 @@
stdenv.mkDerivation rec {
pname = "fwup";
version = "1.8.3";
version = "1.8.4";
src = fetchFromGitHub {
owner = "fhunleth";
repo = "fwup";
rev = "v${version}";
sha256 = "sha256-ayfcnIZ7MuBsCy1giwmY2D2C6AukwS+fevmXqGa4c1w=";
sha256 = "sha256-NaSA3mFWf3C03SAGssMqLT0vr5KMfxD5y/iragGNKjw=";
};
patches = [ ./fix-testrunner-darwin.patch ];
nativeBuildInputs = [
autoreconfHook
pkg-config
@ -44,8 +42,7 @@ stdenv.mkDerivation rec {
libsodium
xz
zlib
]
++ lib.optionals stdenv.isDarwin [
] ++ lib.optionals stdenv.isDarwin [
DiskArbitration
];

View file

@ -1,25 +0,0 @@
diff --git a/tests/common-orig.sh b/tests/common.sh
index 1f2673f..79dcf74 100755
--- a/tests/common-orig.sh
+++ b/tests/common.sh
@@ -21,20 +21,6 @@ else
fi
case "$HOST_OS" in
- Darwin)
- # BSD stat
- STAT_FILESIZE_FLAGS="-f %z"
-
- # Not -d?
- BASE64_DECODE=-D
-
- READLINK=/usr/local/bin/greadlink
- [ -e $READLINK ] || ( echo "Please run 'brew install coreutils' to install greadlink"; exit 1 )
- [ -e /usr/local/bin/mdir ] || ( echo "Please run 'brew install mtools' to install mdir"; exit 1 )
-
- FSCK_FAT=fsck_msdos
- TIMEOUT=gtimeout
- ;;
FreeBSD|NetBSD|OpenBSD|DragonFly)
# BSD stat
STAT_FILESIZE_FLAGS="-f %z"