Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 939df4bc86c1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ca14bcef550e
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 10, 2019

  1. Merge #56494: file: 5.35 -> 5.36 (staging-19.03)

    (cherry picked from commit 63e68e5)
    Fixes #57141.
    dtzWill authored and vcunat committed Mar 10, 2019
    Copy the full SHA
    ca14bce View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/tools/misc/file/default.nix
4 changes: 2 additions & 2 deletions pkgs/tools/misc/file/default.nix
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@

stdenv.mkDerivation rec {
name = "file-${version}";
version = "5.35";
version = "5.36";

src = fetchurl {
urls = [
"ftp://ftp.astron.com/pub/file/${name}.tar.gz"
"https://distfiles.macports.org/file/${name}.tar.gz"
];
sha256 = "0ijm1fabm68ykr1zbx0bxnka5jr3n42sj8y5mbkrnxs0fj0mxi1h";
sha256 = "0ya330cdkvfi2d28h8gvhghj4gnhysmifmryysl0a97xq2884q7v";
};

nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file;