diff options
| author | Fabian Affolter <mail@fabian-affolter.ch> | 2021-07-09 14:08:05 +0200 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-07-12 22:51:55 -0700 |
| commit | fd333014ff258257eb14154e4ee2d227f167ddcd (patch) | |
| tree | 12804200fda4388b0265ec3a2e5885e82c852e6d | |
| parent | 24a688436aec135040410d4ae03ffa991a564d46 (diff) | |
| download | nixpkgs-fd333014ff258257eb14154e4ee2d227f167ddcd.tar nixpkgs-fd333014ff258257eb14154e4ee2d227f167ddcd.tar.gz nixpkgs-fd333014ff258257eb14154e4ee2d227f167ddcd.tar.bz2 nixpkgs-fd333014ff258257eb14154e4ee2d227f167ddcd.tar.lz nixpkgs-fd333014ff258257eb14154e4ee2d227f167ddcd.tar.xz nixpkgs-fd333014ff258257eb14154e4ee2d227f167ddcd.tar.zst nixpkgs-fd333014ff258257eb14154e4ee2d227f167ddcd.zip | |
fwup: 1.8.3 -> 1.8.4
| -rw-r--r-- | pkgs/tools/misc/fwup/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/tools/misc/fwup/fix-testrunner-darwin.patch | 25 |
2 files changed, 3 insertions, 31 deletions
diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index de2b809eea5..69b76cf648d 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -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 ]; diff --git a/pkgs/tools/misc/fwup/fix-testrunner-darwin.patch b/pkgs/tools/misc/fwup/fix-testrunner-darwin.patch deleted file mode 100644 index b04b436ff5b..00000000000 --- a/pkgs/tools/misc/fwup/fix-testrunner-darwin.patch +++ /dev/null @@ -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" |