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: 932e0f30c410
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
  • 9 commits
  • 5 files changed
  • 3 contributors

Commits on Nov 23, 2018

  1. 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 @fpletz
    r-ryantm authored and fpletz committed Nov 23, 2018
    Copy the full SHA
    d869774 View commit details

  2. 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 @fpletz
    r-ryantm authored and fpletz committed Nov 23, 2018
    Copy the full SHA
    68c6f0c View commit details

  3. 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 @fpletz
    r-ryantm authored and fpletz committed Nov 23, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    95137ab View commit details

  4. batman_adv: 2018.2 -> 2018.4 

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

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3d64330 View commit details

  5. 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 @fpletz
    r-ryantm authored and fpletz committed Nov 23, 2018
    Copy the full SHA
    4acd14a View commit details

  6. 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 @fpletz
    r-ryantm authored and fpletz committed Nov 23, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7f2243a View commit details

  7. riot-web: 0.17.3 -> 0.17.6 

    (cherry picked from commit 64da5fc)
    @fpletz
    fpletz committed Nov 23, 2018
    Copy the full SHA
    991bedd View commit details

  8. minetest: 0.4.16 -> 0.4.17 

    (cherry picked from commit 8ff9e78)
    @edwtjo @fpletz
    edwtjo authored and fpletz committed Nov 23, 2018
    Copy the full SHA
    3960912 View commit details

  9. minetest: 0.4.17 -> 0.4.17.1 

    (cherry picked from commit f885437)
    @fpletz
    fpletz committed Nov 23, 2018
    Copy the full SHA
    1fd295f View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/riot/riot-web.nix
View file
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
View file
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
View file
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
View file
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
View file
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;