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: c42f391c0c87
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e2e84cc1f0d7
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on Mar 1, 2019

  1. Merge #56494: file: 5.34 -> 5.36 (staging-18.09) 

    (cherry picked from commit 63e68e5)
Minimal changes, .36 fixes some CVEs.
    @dtzWill @vcunat
    dtzWill authored and vcunat committed Mar 1, 2019
    Copy the full SHA
    2325b5f View commit details

Commits on Mar 2, 2019

  1. Merge #56223: gcc: 8.2.0 -> 8.3.0 

    (cherry picked from commit 3dda94d)
    @vcunat
    vcunat committed Mar 2, 2019
    Copy the full SHA
    feb49b0 View commit details

  2. Merge branch 'release-18.09' into staging-18.09

    @vcunat
    vcunat committed Mar 2, 2019
    Copy the full SHA
    64bc63d View commit details

Commits on Mar 3, 2019

  1. Merge branch 'staging-18.09' into release-18.09

    @vcunat
    vcunat committed Mar 3, 2019
    Copy the full SHA
    e2e84cc View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/development/compilers/gcc/8/default.nix
  2. +2 −2 pkgs/tools/misc/file/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/compilers/gcc/8/default.nix
View file
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ assert langGo -> langCC;
with stdenv.lib;
with builtins;

let version = "8.2.0";
let version = "8.3.0";

enableParallelBuilding = true;

@@ -128,7 +128,7 @@ stdenv.mkDerivation ({

src = fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
sha256 = "10007smilswiiv2ymazr3b6x2i933c0ycxrr529zh4r6p823qv0r";
sha256 = "0b3xv411xhlnjmin2979nxcbnidgvzqdf4nbhix99x60dkzavfk4";
};

inherit patches;
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.34";
version = "5.36";

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

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