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: 5965316f7488
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: 541116d4d746
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 28, 2018

  1. scala: 2.12.5 -> 2.12.6 

    (cherry picked from commit e8012dd)
    @NeQuissimus
    NeQuissimus committed Apr 28, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    0x4A6F
    GPG key ID: 8DEDBA5BE07080E1
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f4be777 View commit details

  2. linux-copperhead: 4.14.36.a -> 4.14.37.a 

    (cherry picked from commit 2eb4229)
    @NeQuissimus
    NeQuissimus committed Apr 28, 2018
    Copy the full SHA
    541116d View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/development/compilers/scala/default.nix
  2. +2 −2 pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
4 changes: 2 additions & 2 deletions pkgs/development/compilers/scala/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:

stdenv.mkDerivation rec {
name = "scala-2.12.5";
name = "scala-2.12.6";

src = fetchurl {
url = "http://www.scala-lang.org/files/archive/${name}.tgz";
sha256 = "18bah2n3jfvc3cb10n4b3d6pwm3rwlqp7lrfvafjxccmlklzyqdj";
sha256 = "05ili2959yrshqi44wpmwy0dyfm4kvp6i8mlbnj1xvc5b9649iqs";
};

propagatedBuildInputs = [ jre ] ;
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
View file
Original file line number Diff line number Diff line change
@@ -3,9 +3,9 @@
with stdenv.lib;

let
version = "4.14.36";
version = "4.14.37";
revision = "a";
sha256 = "052ck8giy5nxy7871crhx6cdkgzzzpffdm8ilq1ys0rd3vldzl9b";
sha256 = "0dwi17hx13kkccqc2315dnb8sfdc0jgv9v4b1xd10v2pnq7qb0x8";

# modVersion needs to be x.y.z, will automatically add .0 if needed
modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));