diff options
author | Robin Gloster <mail@glob.in> | 2021-08-02 17:08:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-02 17:08:40 +0200 |
commit | 15ffca434eb8c47d472c3508abe10616022b31a4 (patch) | |
tree | b0e73ab8b0c835d2a3c6fe6dfecb547d81661cc4 /pkgs/tools/misc/file/default.nix | |
parent | a476da069049bbdd1630ba1bc66e0ba0512cff15 (diff) | |
parent | 5701e5bc3bfb317e1f37ff3fb889eae7584a1206 (diff) | |
download | nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.gz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.bz2 nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.lz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.xz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.zst nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.zip |
Merge branch 'master' into meshcentral
Diffstat (limited to 'pkgs/tools/misc/file/default.nix')
-rw-r--r-- | pkgs/tools/misc/file/default.nix | 10 |
1 files changed, 2 insertions, 8 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; |