Merge remote-tracking branch 'upstream/master' into HEAD

Conflicts: pkgs/os-specific/linux/kernel/generic.nix
2018-02-07 03:41:24 +02:00
parent 335ae38674 fc1224d55d
commit 4c6c919a31
49 changed files with 1909 additions and 268 deletions
@@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "augeas-${version}";
-  version = "1.10.0";
+  version = "1.10.1";

  src = fetchurl {
    url = "http://download.augeas.net/${name}.tar.gz";
-    sha256 = "04q2hr3xj71rdbjdj3jiygi8dbiq1x4szlyavxj1xjiw9jcgd41a";
+    sha256 = "0k9nssn7lk58cl5zv3c8kv2zx9cm2yks3sj7q4fd6qdjz9m2bnsj";
  };
  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [ readline libxml2 ];