Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 261251b29d67
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b7088935d6ed
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 24, 2019

  1. autossh: 1.4f -> 1.5.g

    @pSub
    pSub committed Jan 24, 2019
    Copy the full SHA
    ea58d40 View commit details

Commits on Jan 25, 2019

  1. rustc: mark compileprocess as timeconsuming 

    (cherry picked from commit c5f0dbb)
    @mrVanDalo @grahamc
    mrVanDalo authored and grahamc committed Jan 25, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b708893 View commit details
Showing with 4 additions and 2 deletions.
  1. +2 −0 pkgs/development/compilers/rust/rustc.nix
  2. +2 −2 pkgs/tools/networking/autossh/default.nix
2 changes: 2 additions & 0 deletions pkgs/development/compilers/rust/rustc.nix
View file
Original file line number Diff line number Diff line change
@@ -166,6 +166,8 @@ stdenv.mkDerivation {
# https://github.com/rust-lang/rust/issues/30181
# enableParallelBuilding = false;

requiredSystemFeatures = [ "big-parallel" ];

meta = with stdenv.lib; {
homepage = https://www.rust-lang.org/;
description = "A safe, concurrent, practical language";
4 changes: 2 additions & 2 deletions pkgs/tools/networking/autossh/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{stdenv, fetchurl, openssh}:

stdenv.mkDerivation rec {
name = "autossh-1.4f";
name = "autossh-1.4g";

src = fetchurl {
url = "http://www.harding.motd.ca/autossh/${name}.tgz";
sha256 = "1wpqwa2872nqgqbhnb6nnkrlzpdawd5k69gh1qp68354pvhyawh1";
sha256 = "0xqjw8df68f4kzkns5gcah61s5wk0m44qdk2z1d6388w6viwxhsz";
};

buildInputs = [ openssh ];