Merge staging-next into staging

2019-08-17 09:39:23 +02:00
parent ed3cb39bfa c68f58d95c
commit fe9a3e3e63
174 changed files with 4833 additions and 1993 deletions
--- a/pkgs/development/libraries/cre2/default.nix
+++ b/pkgs/development/libraries/cre2/default.nix
@@ -4,12 +4,12 @@
 stdenv.mkDerivation rec {
  pname = "cre2";
  version = "0.3.0";
-    
+
  src = fetchFromGitHub {
    owner = "marcomaggi";
    repo = "cre2";
-    rev = version;
-    sha256 = "12yrdad87jjqrhbqm02hzsayan2402vf61a9x1b2iabv6d1c1bnj";
+    rev = "v${version}";
+    sha256 = "1h9jwn6z8kjf4agla85b5xf7gfkdwncp0mfd8zwk98jkm8y2qx9q";
  };

  nativeBuildInputs = [