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: 172eb14358f5
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: 932e0f30c410
Choose a head ref
  • 5 commits
  • 5 files changed
  • 3 contributors

Commits on Nov 21, 2018

  1. Bump GHCJS 8.4

    @ElvishJerricco
    ElvishJerricco committed Nov 21, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    sxzz Kevin Deng 三咲智子
    SSH Key Fingerprint: I0/gY8Rb7HnU56beA4F5l8qYUOR7E5wLLU6ZF7o6nLQ
    Verified
    Learn about vigilant mode
    Copy the full SHA
    716bace View commit details

Commits on Nov 23, 2018

  1. Merge pull request #50880 from ElvishJerricco/18.09-bump-ghcjs-2018-1… 

    …1-21

Backport #50879
    @basvandijk
    basvandijk authored Nov 23, 2018
    Copy the full SHA
    a85aacc View commit details

  2. linux: 4.9.138 -> 4.9.140 

    (cherry picked from commit 5879586)
    @NeQuissimus
    NeQuissimus committed Nov 23, 2018
    Copy the full SHA
    6780092 View commit details

  3. linux: 4.14.82 -> 4.14.83 

    (cherry picked from commit 86f9ac2)
    @NeQuissimus
    NeQuissimus committed Nov 23, 2018
    Copy the full SHA
    9fba76c View commit details

  4. linux: 4.19.3 -> 4.19.4 

    (cherry picked from commit 13e38d8)
    @NeQuissimus
    NeQuissimus committed Nov 23, 2018
    Copy the full SHA
    932e0f3 View commit details
4 changes: 2 additions & 2 deletions pkgs/development/compilers/ghcjs-ng/8.4/git.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"url": "https://github.com/ghcjs/ghcjs",
"rev": "d20da90a4819faad1c6309a06363b34edac0374c",
"sha256": "0jmxgfm1zwg6xscjcaycfam7zss8ik4ql4ii5lpryh4h6cdhvkbr",
"rev": "81bf5f31dabaa711aab234cb119eb9c998ccb129",
"sha256": "1bgnc71kjqicqv2xq8p70nck600yi2p7g4k9r1jclv21ib7i5hmx",
"fetchSubmodules": true
}
1 change: 1 addition & 0 deletions pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix
View file
Original file line number Diff line number Diff line change
@@ -156,6 +156,7 @@
tree-diff
];
testToolDepends = [ hspec-discover ];
doHaddock = false;
homepage = "http://www.haskell.org/haddock/";
description = "Library exposing some functionality of Haddock";
license = stdenv.lib.licenses.bsd3;
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.14.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.14.82";
version = "4.14.83";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1b8x77kf3q7nf2h3s9vnn0hzi45srxxin7f9rvg70vd7yvka5457";
sha256 = "081zxc7ikcn1hy22pw5af0dql9pq24h2anfgnykc83jfjbg2h5vh";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.19.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.19.3";
version = "4.19.4";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0834k2lsflp6mgxv1vs1gr4fykg5z0hd4sbbrw3z7zfhsh95fg0y";
sha256 = "1aj7zwrjwrjb3m3nfccykmcvhrrjsk1zchc5g4f63xd1pc35d3x3";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.9.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.9.138";
version = "4.9.140";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1dr1mf7i1mwy780048gkhvy283j8331xwgrs2x5qal0xc1114c4j";
sha256 = "0hzrha3rh90jwxjmrh4npd0q56pf512nmb8i2p484k9cikssx27q";
};
} // (args.argsOverride or {}))