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: a85aacc8061c
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: 1fd295ff0d16
Choose a head ref
  • 12 commits
  • 8 files changed
  • 4 contributors

Commits on Nov 23, 2018

  1. linux: 4.9.138 -> 4.9.140

    (cherry picked from commit 5879586)
    NeQuissimus committed Nov 23, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    6780092 View commit details
  2. linux: 4.14.82 -> 4.14.83

    (cherry picked from commit 86f9ac2)
    NeQuissimus committed Nov 23, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    9fba76c View commit details
  3. linux: 4.19.3 -> 4.19.4

    (cherry picked from commit 13e38d8)
    NeQuissimus committed Nov 23, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    932e0f3 View commit details
  4. batctl: 2018.2 -> 2018.3

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/batctl/versions
    
    (cherry picked from commit 6d8f22a)
    r-ryantm authored and fpletz committed Nov 23, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    Copy the full SHA
    d869774 View commit details
  5. alfred: 2018.2 -> 2018.3

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/alfred/versions
    
    (cherry picked from commit 40ea9c7)
    r-ryantm authored and fpletz committed Nov 23, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    Copy the full SHA
    68c6f0c View commit details
  6. batctl: 2018.3 -> 2018.4 (#50826)

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/batctl/versions
    
    (cherry picked from commit 119e4e3)
    r-ryantm authored and fpletz committed Nov 23, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    Copy the full SHA
    95137ab View commit details
  7. batman_adv: 2018.2 -> 2018.4

    (cherry picked from commit b62a18b)
    fpletz committed Nov 23, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    Copy the full SHA
    3d64330 View commit details
  8. riot-web: 0.16.5 -> 0.17.0

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/riot-web/versions
    
    (cherry picked from commit 5d88d54)
    r-ryantm authored and fpletz committed Nov 23, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    Copy the full SHA
    4acd14a View commit details
  9. riot-web: 0.17.0 -> 0.17.3

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/riot-web/versions
    
    (cherry picked from commit f091b32)
    r-ryantm authored and fpletz committed Nov 23, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    Copy the full SHA
    7f2243a View commit details
  10. riot-web: 0.17.3 -> 0.17.6

    (cherry picked from commit 64da5fc)
    fpletz committed Nov 23, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    Copy the full SHA
    991bedd View commit details
  11. minetest: 0.4.16 -> 0.4.17

    (cherry picked from commit 8ff9e78)
    edwtjo authored and fpletz committed Nov 23, 2018

    Partially verified

    This commit is signed with the committer’s verified signature.
    fpletz’s contribution has been verified via GPG key.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    3960912 View commit details
  12. minetest: 0.4.17 -> 0.4.17.1

    (cherry picked from commit f885437)
    fpletz committed Nov 23, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    Copy the full SHA
    1fd295f View commit details
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@
let configFile = writeText "riot-config.json" conf; in
stdenv.mkDerivation rec {
name= "riot-web-${version}";
version = "0.16.5";
version = "0.17.6";

src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "1b82d82pfv4kjdxghc8y78zwmnc89hi7arvql2bx0zyfhzxj6drl";
sha256 = "1y38fq0r9cxmazh9rjc5qy7fzwy81ad35k538d6rsfwz1y88ipdm";
};

installPhase = ''
6 changes: 3 additions & 3 deletions pkgs/games/minetest/default.nix
Original file line number Diff line number Diff line change
@@ -4,19 +4,19 @@
}:

let
version = "0.4.16";
version = "0.4.17.1";
sources = {
src = fetchFromGitHub {
owner = "minetest";
repo = "minetest";
rev = "${version}";
sha256 = "048m8as01bw4pnwfxx04wfnyljxq7ivk88l214zi18prrrkfamj3";
sha256 = "19sfblgh9mchkgw32n7gdvm7a8a9jxsl9cdlgmxn9bk9m939a2sg";
};
data = fetchFromGitHub {
owner = "minetest";
repo = "minetest_game";
rev = "${version}";
sha256 = "0alikzyjvj9hd8s3dd6ghpz0y982w2j0yd2zgd7a047mxw21hrcn";
sha256 = "1g8iw2pya32ifljbdx6z6rpcinmzm81i9minhi2bi1d500ailn7s";
};
};
in stdenv.mkDerivation {
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/batman-adv/alfred.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }:

let
ver = "2018.2";
ver = "2018.4";
in
stdenv.mkDerivation rec {
name = "alfred-${ver}";

src = fetchurl {
url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
sha256 = "0640p9zy1511pl30i5yybqa0s1yqz83291vw1z22jrcsq57rrgib";
sha256 = "0n6cw6inkzlgz8p6jcc83npqjmvhxp4qsh2dhbiv88ax3lh9arcd";
};

nativeBuildInputs = [ pkgconfig ];
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/batman-adv/batctl.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, libnl }:

let
ver = "2018.2";
ver = "2018.4";
in
stdenv.mkDerivation rec {
name = "batctl-${ver}";

src = fetchurl {
url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
sha256 = "09bxh4yifqiphn0ljc3msbxid62ynd9kk3vn82h13gcpfnyckw6z";
sha256 = "0mv2vlzcqfh5yavg2sqncca9iqgxi6llv83wwwsf3d38x2jjff74";
};

nativeBuildInputs = [ pkgconfig ];
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/batman-adv/default.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, kernel }:

let base = "batman-adv-2018.2"; in
let base = "batman-adv-2018.4"; in

stdenv.mkDerivation rec {
name = "${base}-${kernel.version}";

src = fetchurl {
url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz";
sha256 = "1jdqlbn8mp9rycbnkgjsb98pb2c7jzw9mm30d3iga69ycwk5dqyq";
sha256 = "0ka80l3ajfzi9plq50m79d2qpm1rlir4js5hy3g1mkj1gnyb801m";
};

nativeBuildInputs = kernel.moduleBuildDependencies;
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.14.nix
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
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
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 {}))