Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c40ac69ec3cd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 55742a20445a
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Jul 31, 2017

  1. batman-adv: 2017.1 -> 2017.2

    @fpletz
    fpletz committed Jul 31, 2017
    Copy the full SHA
    ee8df19 View commit details

  2. cacert: fix unicode names in blacklist 

    Fixes #27576.
    @fpletz
    fpletz committed Jul 31, 2017
    Copy the full SHA
    55742a2 View commit details
4 changes: 2 additions & 2 deletions pkgs/data/misc/cacert/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, writeText, nss, python
{ stdenv, fetchurl, writeText, nss, python3
, blacklist ? []
, includeEmail ? false
}:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {

src = nss.src;

nativeBuildInputs = [ python ];
nativeBuildInputs = [ python3 ];

configurePhase = ''
ln -s nss/lib/ckfw/builtins/certdata.txt
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 = "2017.1";
ver = "2017.2";
in
stdenv.mkDerivation rec {
name = "alfred-${ver}";

src = fetchurl {
url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
sha256 = "1c6zq8j0nb1wm9zzlzc2bn8a500pvqbn2vv9hrv6nvq7il2silzq";
sha256 = "00sagxzkx0gqdkvc84w4bjy833l7n10hqalxdwkfxxwqwammclix";
};

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 = "2017.1";
ver = "2017.2";
in
stdenv.mkDerivation rec {
name = "batctl-${ver}";

src = fetchurl {
url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
sha256 = "1imb59iaaw50y76595z6zvqnbpjgqkkp79gq4s7w7nj8wikiqcgq";
sha256 = "0v2k9ylmk8i85p69dh6gh134f081gm1clq1vnhn6x4831n8x0q64";
};

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-2017.1"; in
let base = "batman-adv-2017.2"; in

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

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

hardeningDisable = [ "pic" ];