diff options
| author | Kid <kidonng@gmail.com> | 2021-06-18 01:29:06 +0800 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2021-07-24 15:22:54 +0200 |
| commit | 5a4a561f8bf8d6ae3314d54f973dc9d0e9adda76 (patch) | |
| tree | 2dc934798ba5be153c5633f5703c0c50254fabd1 | |
| parent | d073245f24ae81113f2fead586812932b3520f04 (diff) | |
| download | nixpkgs-5a4a561f8bf8d6ae3314d54f973dc9d0e9adda76.tar nixpkgs-5a4a561f8bf8d6ae3314d54f973dc9d0e9adda76.tar.gz nixpkgs-5a4a561f8bf8d6ae3314d54f973dc9d0e9adda76.tar.bz2 nixpkgs-5a4a561f8bf8d6ae3314d54f973dc9d0e9adda76.tar.lz nixpkgs-5a4a561f8bf8d6ae3314d54f973dc9d0e9adda76.tar.xz nixpkgs-5a4a561f8bf8d6ae3314d54f973dc9d0e9adda76.tar.zst nixpkgs-5a4a561f8bf8d6ae3314d54f973dc9d0e9adda76.zip | |
file: 5.39 -> 5.40
| -rw-r--r-- | pkgs/tools/misc/file/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/tools/misc/file/webassembly-format-fix.patch | 13 |
2 files changed, 2 insertions, 21 deletions
diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 4a9dc7ee774..cc56205243d 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -2,22 +2,16 @@ stdenv.mkDerivation rec { pname = "file"; - version = "5.39"; + version = "5.40"; src = fetchurl { urls = [ "ftp://ftp.astron.com/pub/file/${pname}-${version}.tar.gz" "https://distfiles.macports.org/file/${pname}-${version}.tar.gz" ]; - sha256 = "1lgs2w2sgamzf27kz5h7pajz7v62554q21fbs11n4mfrfrm2hpgh"; + sha256 = "0myxlpj9gy2diqavx33vq88kpvr1k1bpzsm0d0zmb2hl7ks22wqn"; }; - patches = [ - # https://github.com/file/file/commit/85b7ab83257b3191a1a7ca044589a092bcef2bb3 - # Without the RCS id change to avoid conflicts. Remove on next bump. - ./webassembly-format-fix.patch - ]; - nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isWindows libgnurx; diff --git a/pkgs/tools/misc/file/webassembly-format-fix.patch b/pkgs/tools/misc/file/webassembly-format-fix.patch deleted file mode 100644 index 5eca833e4d7..00000000000 --- a/pkgs/tools/misc/file/webassembly-format-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/funcs.c b/src/funcs.c -index 299b8f022..ecbfa28c5 100644 ---- a/src/funcs.c -+++ b/src/funcs.c -@@ -93,7 +93,7 @@ file_checkfmt(char *msg, size_t mlen, const char *fmt) - if (*++p == '%') - continue; - // Skip uninteresting. -- while (strchr("0.'+- ", *p) != NULL) -+ while (strchr("#0.'+- ", *p) != NULL) - p++; - if (*p == '*') { - if (msg) |