Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1527134
2019-06-25 14:04:12 +02:00
parent dafee3d91a cd83cecdc8
commit 145a620802
100 changed files with 7864 additions and 623 deletions
--- a/pkgs/applications/virtualization/conmon/default.nix
+++ b/pkgs/applications/virtualization/conmon/default.nix
@@ -9,13 +9,13 @@
 stdenv.mkDerivation rec {
  project = "conmon";
  name = "${project}-${version}";
-  version = "0.2.0";
+  version = "0.3.0";

  src = fetchFromGitHub {
    owner = "containers";
    repo = project;
    rev = "v${version}";
-    sha256 = "08fgkbv7hq62lcq39za9pm2s2j92ismgrkvfm7acwbvajqh9syjb";
+    sha256 = "0s23gm0cq4mylv882dr1n8bqql42674vny3z58yy77lwzmifc6id";
  };

  nativeBuildInputs = [ pkgconfig ];