Merge branch 'master' into staging

That's to get mesa rebuild from master, as it's nontrivial.

8 files changed, 66 insertions, 20 deletions

diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix
index 5394829a830..3693a27ac23 100644
--- a/pkgs/development/tools/build-managers/dub/default.nix
+++ b/pkgs/development/tools/build-managers/dub/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, curl, dmd, gcc }:
 
-let version = "0.9.24"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "dub-${version}";
+  version = "0.9.25";
 
   src = fetchFromGitHub {
-    sha256 = "1j2cs2mvaj6bjjicabq6lh97nx0v4b2k6pj4cmywki7hf3i1p8yy";
+    sha256 = "0cb4kx72fvk6vfqkk0mrp6fvv512xhw03dq2dn9lng0daydvdcim";
     rev = "v${version}";
     repo = "dub";
     owner = "D-Programming-Language";
@@ -15,16 +15,17 @@ stdenv.mkDerivation {
   propagatedBuildInputs = [ gcc dmd ];
 
   buildPhase = ''
-      # Avoid that the version file is overwritten
-      substituteInPlace build.sh \
-          --replace source/dub/version_.d /dev/null
-      ./build.sh
+    # Avoid that the version file is overwritten
+    substituteInPlace build.sh \
+      --replace source/dub/version_.d /dev/null
+    patchShebangs ./build.sh
+    ./build.sh
   '';
 
   installPhase = ''
-      mkdir $out
-      mkdir $out/bin
-      cp bin/dub $out/bin
+    mkdir $out
+    mkdir $out/bin
+    cp bin/dub $out/bin
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix
index 83ff85298f4..8b07f554c6a 100644
--- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix
+++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix
@@ -6,9 +6,9 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://github.com/editorconfig/editorconfig-core-c.git";
-    rev = "99d09270c58b817ea218979d513a90099ade6277";
+    rev = "d1c2c881158dfb9faa4498a0b19593dcd105d6b8";
     fetchSubmodules = true;
-    sha256 = "0s35dzf2180205xq2xpfmmlfw112j3h87swnisza85qwwz8bf2k9";
+    sha256 = "0awpb63ci85kal3pnlj2b54bay8igj1rbc13d8gqkvidlb51nnx4";
     inherit name;
   };
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     '';
     downloadPage = "https://github.com/editorconfig/editorconfig-core-c";
     license = with licenses; [ bsd2 bsd3 ];
-    version = "0.12.0";
+    version = "0.12.1";
     maintainers = [ maintainers.dochang ];
   };
 
diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix
index 70aedbb48d2..a4c61a58b89 100644
--- a/pkgs/development/tools/misc/uncrustify/default.nix
+++ b/pkgs/development/tools/misc/uncrustify/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "uncrustify";
-  version = "0.61";
+  version = "0.63";
 
   src = fetchurl {
     url = "mirror://sourceforge/uncrustify/${product}-${version}.tar.gz";
-    sha256 = "1df0e5a2716e256f0a4993db12f23d10195b3030326fdf2e07f8e6421e172df9";
+    sha256 = "1qravjzmips3m7asbsd0qllmprrl1rshjlmnfq68w84d38sb3yyz";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix
index 461fda45d4c..38b97c006cd 100644
--- a/pkgs/development/tools/ocaml/cppo/default.nix
+++ b/pkgs/development/tools/ocaml/cppo/default.nix
@@ -1,7 +1,7 @@
-{stdenv, fetchurl, ocaml, findlib}:
+{ stdenv, fetchFromGitHub, ocaml, findlib }:
 let
   pname = "cppo";
-  version = "1.1.2";
+  version = "1.3.2";
   webpage = "http://mjambon.com/${pname}.html";
 in
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
@@ -9,9 +9,11 @@ stdenv.mkDerivation rec {
 
   name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "http://mjambon.com/releases/${pname}/${name}.tar.gz";
-    sha256 = "1pfzch4ys5gjac2lrkqq0gzmm5plkq2jl17b2m3n06kmwashqplp";
+  src = fetchFromGitHub {
+    owner = "mjambon";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "06j0zr78f04ahxi2459vjn61z25hkvs4dfj76200ydg3g6ifb3k1";
   };
 
   buildInputs = [ ocaml findlib ];
diff --git a/pkgs/development/tools/sass/Gemfile b/pkgs/development/tools/sass/Gemfile
new file mode 100644
index 00000000000..e46ea120f72
--- /dev/null
+++ b/pkgs/development/tools/sass/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'sass'
diff --git a/pkgs/development/tools/sass/Gemfile.lock b/pkgs/development/tools/sass/Gemfile.lock
new file mode 100644
index 00000000000..82dcddb9ece
--- /dev/null
+++ b/pkgs/development/tools/sass/Gemfile.lock
@@ -0,0 +1,13 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    sass (3.4.22)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  sass
+
+BUNDLED WITH
+   1.11.2
diff --git a/pkgs/development/tools/sass/default.nix b/pkgs/development/tools/sass/default.nix
new file mode 100644
index 00000000000..a291ca2de5d
--- /dev/null
+++ b/pkgs/development/tools/sass/default.nix
@@ -0,0 +1,18 @@
+{ lib, bundlerEnv, ruby }:
+
+bundlerEnv {
+  name = "sass-3.4.22";
+
+  inherit ruby;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+
+  meta = with lib; {
+    description = "Tools and Ruby libraries for the CSS3 extension languages: Sass and SCSS";
+    homepage    = http://sass-lang.com/;
+    license     = licenses.mit;
+    maintainers = [ maintainers.romildo ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/development/tools/sass/gemset.nix b/pkgs/development/tools/sass/gemset.nix
new file mode 100644
index 00000000000..31e4e6ab6d3
--- /dev/null
+++ b/pkgs/development/tools/sass/gemset.nix
@@ -0,0 +1,10 @@
+{
+  sass = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dkj6v26fkg1g0majqswwmhxva7cd6p3psrhdlx93qal72dssywy";
+      type = "gem";
+    };
+    version = "3.4.22";
+  };
+}
\ No newline at end of file