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: e416d2f8b9ac
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 63e68e5bb92b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 27, 2019

  1. Revert "Merge #56170: Revert "file: 5.35 -> 5.36" (staging)" 

    Try this again, seems to work now.

Motivated by new version possibly fixing security issues
described here:

#56360

This reverts commit 7d47102, reversing
changes made to 2ed8187.
    @dtzWill
    dtzWill committed Feb 27, 2019
    Copy the full SHA
    7aea4cc View commit details

Commits on Mar 1, 2019

  1. Merge pull request #56494 from dtzWill/update/file-5.36 

    Revert "Merge #56170: Revert "file: 5.35 -> 5.36" (staging)"
    @dtzWill
    dtzWill authored Mar 1, 2019
    Copy the full SHA
    63e68e5 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
View file
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;