Merge branch 'master' into staging

14 files changed, 114 insertions, 222 deletions

diff --git a/pkgs/development/compilers/agda/stdlib.nix b/pkgs/development/compilers/agda/stdlib.nix
index a583ff33cb68..597d0228b45d 100644
--- a/pkgs/development/compilers/agda/stdlib.nix
+++ b/pkgs/development/compilers/agda/stdlib.nix
@@ -1,12 +1,12 @@
 { stdenv, agda, fetchurl, ghc, filemanip }:
 
 agda.mkDerivation (self: rec {
-  name = "Agda-stdlib";
-  version = "0.8.1";
+  version = "0.9";
+  name = "Agda-stdlib-${version}";
 
   src = fetchurl {
     url = "https://github.com/agda/agda-stdlib/archive/v${version}.tar.gz";
-    sha256 = "0ij4rg4lk0pq01ing285gbmnn23dcf2rhihdcs8bbdpjg52vl4gf";
+    sha256 = "05rpmd2xra8wygq33mahdmijcjwq132l1akqyzj66n13frw4hfwj";
   };
 
   buildInputs = [ filemanip ghc ];
diff --git a/pkgs/development/compilers/elm/elm-get.nix b/pkgs/development/compilers/elm/elm-get.nix
index db6feecea425..d01a3226d29b 100644
--- a/pkgs/development/compilers/elm/elm-get.nix
+++ b/pkgs/development/compilers/elm/elm-get.nix
@@ -15,6 +15,7 @@ cabal.mkDerivation (self: {
     aeson aesonPretty ansiWlPprint binary Elm filepath HTTP httpClient
     httpClientTls httpTypes mtl network optparseApplicative vector
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/elm-lang/elm-get";
     description = "Tool for sharing and using Elm libraries";
diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix
index d710f6729956..c6165bb55869 100644
--- a/pkgs/development/compilers/gforth/default.nix
+++ b/pkgs/development/compilers/gforth/default.nix
@@ -1,10 +1,27 @@
 { stdenv, fetchurl, m4 }:
 
-stdenv.mkDerivation rec {
-  name = "gforth-0.7.3";
+let
+  version = "0.7.3";
+in
+stdenv.mkDerivation {
+  name = "gforth-${version}";
   src = fetchurl {
-    url = "http://ftp.gnu.org/gnu/gforth/gforth-0.7.3.tar.gz";
+    url = "http://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz";
     sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig";
   };
+
   buildInputs = [ m4 ];
-}
\ No newline at end of file
+
+  postInstall = ''
+    mkdir -p $out/share/emacs/site-lisp
+    cp gforth.el $out/share/emacs/site-lisp/
+  '';
+
+  meta = {
+    description = "The Forth implementation of the GNU project";
+    homepage = https://www.gnu.org/software/gforth/;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+  };
+}
diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix
index 8219882a2a21..fad8a584ed2a 100644
--- a/pkgs/development/compilers/nasm/default.nix
+++ b/pkgs/development/compilers/nasm/default.nix
@@ -2,16 +2,17 @@
 
 stdenv.mkDerivation rec {
   name = "nasm-${version}";
-  version = "2.11.05";
-  
+  version = "2.11.05"; # do not update until syslinux is fixed with that version
+
   src = fetchurl {
     url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";
     sha256 = "1sgspnascc0asmwlv3jm1mq4vzx653sa7vlg48z20pfybk7pnhaa";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.nasm.us/;
     description = "An 80x86 and x86-64 assembler designed for portability and modularity";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix
index c25080229ffa..f0b503bd0be7 100644
--- a/pkgs/development/compilers/opa/default.nix
+++ b/pkgs/development/compilers/opa/default.nix
@@ -1,32 +1,25 @@
-{ stdenv, fetchurl, which, ocaml, perl, jdk
-, findlib, ocaml_ssl, openssl, cryptokit, camlzip, ulex
-, ocamlgraph, coreutils, zlib, ncurses, makeWrapper
-, gcc, binutils, gnumake, nodejs, git } :
+{ stdenv, fetchgit, which, perl, jdk
+, ocamlPackages, openssl
+, coreutils, zlib, ncurses, makeWrapper
+, gcc, binutils, gnumake, nodejs} :
 
 stdenv.mkDerivation rec {
   pname = "opa";
-  version = "4308";
+  version = "4309";
   name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/MLstate/opalang/tarball/v${version}";
-    name = "opa-${version}.tar.gz";
-    sha256 = "1farii9474i14ack6bpqm1jihs6i8pvwky3a7q8v8pbnl4i6lb5g";
+  src = fetchgit {
+    url = https://github.com/MLstate/opalang.git;
+    rev = "047f58bfd4be35ee30176156b3718c707a6c0f76";
+    sha256 = "1jbxfrmpbjjk7qvaxdn47044w5m8wr96q9yx65ib3wlapmjbvdvf";
   };
 
   # Paths so the opa compiler code generation will use the same programs as were
   # used to build opa.
-  codeGeneratorPaths = "${ocaml}/bin:${gcc}/bin:${binutils}/bin:${gnumake}/bin";
-
-  prePatch = ''
-    find . -type f -exec sed -i 's@/usr/bin/env@${coreutils}/bin/env@' {} \;
-    find . -type f -exec sed -i 's@/usr/bin/perl@${perl}/bin/perl@' {} \;
-  '';
-
-  patches = [];
+  codeGeneratorPaths = "${ocamlPackages.ocaml}/bin:${gcc}/bin:${binutils}/bin:${gnumake}/bin:${nodejs}/bin";
 
   preConfigure = ''
-    configureFlags="$configureFlags -prefix $out"
+    patchShebangs .
     (
     cat ./compiler/buildinfos/buildInfos.ml.pre
     ./compiler/buildinfos/generate_buildinfos.sh . --release --version ./compiler/buildinfos/version_major.txt 
@@ -36,14 +29,17 @@ stdenv.mkDerivation rec {
     )> ./compiler/buildinfos/buildInfos.ml
   '';
 
-  dontAddPrefix = true;
+  prefixKey = "-prefix ";
+
+  configureFlags = "-ocamlfind ${ocamlPackages.findlib}/bin/ocamlfind ";
 
-  configureFlags = "-ocamlfind ${findlib}/bin/ocamlfind ";
+  buildInputs = [ which perl jdk openssl coreutils zlib ncurses
+    makeWrapper gcc binutils gnumake nodejs
+  ] ++ (with ocamlPackages; [
+    ocaml findlib ocaml_ssl cryptokit camlzip ulex ocamlgraph
+  ]);
 
-  buildInputs = [ which ocaml perl jdk findlib ocaml_ssl openssl cryptokit camlzip ulex
-                  ocamlgraph coreutils zlib ncurses makeWrapper gcc binutils gnumake
-		  nodejs git
-		  ];
+  NIX_LDFLAGS = "-lgcc_s";
 
   postInstall = ''
     # Have compiler use same tools for code generation as used to build it.
@@ -53,7 +49,7 @@ stdenv.mkDerivation rec {
 
     # Install emacs mode.
     mkdir -p $out/share/emacs/site-lisp/opa
-    install -m 0644 -v ./utils/emacs/{opa-mode.el,site-start.el} $out/share/emacs/site-lisp/opa
+    install -m 0644 -v ./tools/editors/emacs/{opa-mode.el,site-start.el} $out/share/emacs/site-lisp/opa
   '';
 
   meta = {
@@ -66,15 +62,6 @@ stdenv.mkDerivation rec {
     homepage = http://opalang.org/;
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.kkallio ];
-    platforms = [ "x86_64-linux" ];
-    # File "compiler/libqmlcompil/dbGen/schema_io.ml", line 199, characters 3-53:
-    # Error: Signature mismatch:
-    #        ...
-    #     The field `remove_edge_e' is required but not provided
-    #     The field `remove_edge' is required but not provided
-    #     The field `remove_vertex' is required but not provided
-    # Command exited with code 2.
-    # make: *** [node] Error 10
-    broken = true;
+    platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/development/compilers/opa/libdir.patch b/pkgs/development/compilers/opa/libdir.patch
deleted file mode 100644
index 05c8a89afa87..000000000000
--- a/pkgs/development/compilers/opa/libdir.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-These patches have the compiler place path flags in various places so that
-ocaml and c libraries are found in their Nixpkgs locations.
-
-diff -x '*~' -Naur MLstate-opalang-6b295a9//build_rules.ml MLstate-opalang-6b295a9-new//build_rules.ml
---- MLstate-opalang-6b295a9//build_rules.ml	2011-11-21 08:07:04.000000000 -0430
-+++ MLstate-opalang-6b295a9-new//build_rules.ml	2011-11-27 00:34:35.845277134 -0430
-@@ -373,7 +373,11 @@
-     | Some dep -> dep::list
-   ) (tags_of_pathname (env "%.opa_plugin")) []
-   in
--  let lib_dir s = [A"--ml";A"-I";A"--ml";P (if Pathname.exists s then ".." / s else ("+"^s))] in
-+  let cryptokitdir_opt = function
-+    | Some path -> path
-+    | None -> ""
-+  in
-+  let lib_dir s = [A"--ml";A"-I";A"--ml";P (if Pathname.exists s then ".." / s else (if s = "cryptokit" then (cryptokitdir_opt Config.Libdir.cryptokit) else ("+"^s)))] in
-   let include_dirs = List.flatten (List.map lib_dir caml_use_lib) in
-   let files = List.map ((^) path) files in
-   build_list build files;
-diff -x '*~' -Naur MLstate-opalang-6b295a9//config.mli MLstate-opalang-6b295a9-new//config.mli
---- MLstate-opalang-6b295a9//config.mli	2011-11-21 08:07:04.000000000 -0430
-+++ MLstate-opalang-6b295a9-new//config.mli	2011-11-27 00:30:39.312443906 -0430
-@@ -43,6 +43,9 @@
- (** Flag for Dbm present *)
- val has_dbm : bool
- 
-+(** openssh link directory *)
-+val openssl : string option
-+
- (** library directories, if the libs are enabled *)
- val libnatpmp : (string*string*string) option (** name of the lib, lib dir, include dir *)
- 
-diff -x '*~' -Naur MLstate-opalang-6b295a9//configure MLstate-opalang-6b295a9-new//configure
---- MLstate-opalang-6b295a9//configure	2011-11-21 08:07:04.000000000 -0430
-+++ MLstate-opalang-6b295a9-new//configure	2011-11-27 00:40:52.496151405 -0430
-@@ -27,6 +27,7 @@
- 
- NO_CAMLIDL=1
- NO_DBM=1
-+CONFIG_LIB_OPENSSL=""
- 
- while [ $# -gt 0 ]; do
-     case "$1" in
-@@ -51,6 +52,11 @@
-             shift
-             OCAMLOPT=$1
-             ;;
-+        -openssl)
-+            if [ $# -lt 2 ]; then echo "Error: option $1 requires an argument" >&2; exit 1; fi
-+            shift
-+            CONFIG_LIB_OPENSSL=$1
-+            ;;
-         -ocamlfind)
-             if [ $# -lt 2 ]; then echo "Error: option $1 requires an argument" >&2; exit 1; fi
-             shift
-@@ -647,6 +653,8 @@
- let miniupnpc = $(camlopt "$HAS_MINIUPNPC" "$(camlstrtuple "${MINIUPNPC[@]}")")
- let has_dbm = $(camlbool "$HAS_DBM")
- 
-+let openssl = $(camlopt "$CONFIG_LIB_OPENSSL" '"'"$CONFIG_LIB_OPENSSL"'"')
-+
- let available = [ $TAGS_LIST]
- let all_tags = [ $(for t in $ALL_TAGS_LIST; do echo -n "\"$t\"; "; done)]
- 
-diff -x '*~' -Naur MLstate-opalang-6b295a9//qml2ocaml/qml2ocamlOptions.ml MLstate-opalang-6b295a9-new//qml2ocaml/qml2ocamlOptions.ml
---- MLstate-opalang-6b295a9//qml2ocaml/qml2ocamlOptions.ml	2011-11-21 08:07:04.000000000 -0430
-+++ MLstate-opalang-6b295a9-new//qml2ocaml/qml2ocamlOptions.ml	2011-11-27 00:32:57.721442828 -0430
-@@ -44,6 +44,7 @@
- 
-   let options_linker =
-     ["-w a"]
-+    @ (match Config.openssl with | Some dir -> ["-ccopt"; "-L"^dir] | None -> [])
-     @ (if Base.is_windows then
-          ["-cclib"; "Dnsapi.lib"; "-cclib"; "libeay32.lib"; "-cclib"; "ssleay32.lib" (*; "ssl_stubs.obj" *)]
-        else [])
-@@ -51,11 +52,13 @@
-   (**
-      Absolute path for include directory, will be passed with the option -I to the ocaml compiler.
-   *)
-+  let uselibdirpath = fun po p -> match po with | Some path -> path | None -> p
-+
-   let server_include_dir = [
--    "+zip" ; "+site-lib/zip" ; "+site-lib/camlzip" ;
--    "+ssl" ; "+site-lib/ssl" ;
--    "+cryptokit"; "+site-lib/cryptokit" ;
--    "+ulex" ; "+site-lib/ulex" ;
-+    uselibdirpath Config.Libdir.camlzip "+zip" ; "+site-lib/zip" ; "+site-lib/camlzip" ;
-+    uselibdirpath Config.Libdir.ssl "+ssl" ; "+site-lib/ssl" ;
-+    uselibdirpath Config.Libdir.cryptokit "+cryptokit"; "+site-lib/cryptokit" ;
-+    uselibdirpath Config.Libdir.ulex "+ulex" ; "+site-lib/ulex" ;
-   ] @ (
-     if Config.has_dbm then [
-       "+dbm" ; "+site-lib/dbm" ;
diff --git a/pkgs/development/compilers/opa/locate.patch b/pkgs/development/compilers/opa/locate.patch
deleted file mode 100644
index e67e6bab2603..000000000000
--- a/pkgs/development/compilers/opa/locate.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Needed to have ocamlfind discover ocamlgraph with Nixpkgs.
-
-diff -x '*~' -Naur MLstate-opalang-ee92891/configure MLstate-opalang-ee92891-new//configure
---- MLstate-opalang-ee92891/configure	2011-09-30 05:41:18.000000000 -0430
-+++ MLstate-opalang-ee92891-new//configure	2011-11-24 13:47:01.332558705 -0430
-@@ -567,7 +567,7 @@
- fi
- 
- # - checking ocamlgraph
--if ! CONFIG_LIB_OCAMLGRAPH=$(locate-ocaml-lib "Graph" "ocamlgraph/graph")
-+if ! CONFIG_LIB_OCAMLGRAPH=$(locate-ocaml-lib "Graph" "ocamlgraph" "graph")
- then lib-not-found "ocamlgraph" "libocamlgraph-ocaml-dev"
- fi
- 
diff --git a/pkgs/development/compilers/roadsend/default.nix b/pkgs/development/compilers/roadsend/default.nix
deleted file mode 100644
index f17cbbbda9a5..000000000000
--- a/pkgs/development/compilers/roadsend/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ composableDerivation, fetchurl, bigloo, curl, fcgi ? null, libxml2 ? null, mysql ? null }:
-
-let edf = composableDerivation.edf; in
-
-composableDerivation.composableDerivation {} {
-  name = "roadsend-2.9.3";
-  
-  buildInputs = [bigloo curl];
-  
-  flags = edf { name = "pcre"; }
-       // edf { name = "fcgi"; enable = { inherit fcgi; }; }
-       // edf { name = "xml"; enable = { buildInputs = [ libxml2 ]; }; }
-       // edf { name = "mysql"; enable = { buildInputs = [ mysql ]; }; }
-       // edf { name = "odbc"; };
-       # // edf { name = "gtk"} }
-       # // edf { name = "gtk2", enable = { buildInputs = [ mysql ]; } }
-
-  cfg = {
-    pcreSupport = true;
-    fcgiSupport = true;
-    xmlSupport = true;
-    mysqlSupport = true;
-  };
-  
-  src = fetchurl {
-    url = "http://code.roadsend.com/snaps/roadsend-php-20081210.tar.bz2";
-    sha256 = "0yhpiik0dyayd964wvn2k0cq7b1gihx1k3qx343r2l7lla4mapsx";
-  };
-
-  # tell pcc where to find the fastcgi library 
-  postInstall = " sed -e \"s=(ldflags fastcgi.*=(ldflags -l fastcgi -L \$fcgi)=\" -i \$out/etc/pcc.conf ";
-  
-  meta = {
-    description = "A PHP to C compiler";
-    homepage = http://www.roadsend.com;
-    # you can choose one of the following licenses: 
-    # Runtime license is LPGL 2.1
-    license = ["GPL2"];
-  };
-}
diff --git a/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch b/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch
index 23bb3f69986c..83fb26e7a474 100644
--- a/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch
+++ b/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch
@@ -1,20 +1,5 @@
-diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs
-index 81f856c..c2078a5 100644
---- a/src/librustc/back/link.rs
-+++ b/src/librustc/back/link.rs
-@@ -361,8 +361,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri
- 
- pub fn get_cc_prog(sess: &Session) -> String {
-     match sess.opts.cg.linker {
--        Some(ref linker) => return linker.to_string(),
--        None => sess.target.target.options.linker.clone(),
-+        Some(ref linker) => linker.to_string(),
-+        None => "@ccPath@".to_string(),
-     }
- }
- 
 diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs
-index db2f291..c7a13dc 100644
+index a88bcaf..9c3858d 100644
 --- a/src/librustc_back/archive.rs
 +++ b/src/librustc_back/archive.rs
 @@ -54,7 +54,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>,
@@ -26,3 +11,18 @@ index db2f291..c7a13dc 100644
      };
      let mut cmd = Command::new(ar);
  
+diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs
+index d27a338..c9b1508 100644
+--- a/src/librustc_trans/back/link.rs
++++ b/src/librustc_trans/back/link.rs
+@@ -361,8 +361,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri
+ 
+ pub fn get_cc_prog(sess: &Session) -> String {
+     match sess.opts.cg.linker {
+-        Some(ref linker) => return linker.to_string(),
+-        None => sess.target.target.options.linker.clone(),
++        Some(ref linker) => linker.to_string(),
++        None => "@ccPath@".to_string(),
+     }
+ }
+ 
diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index 707cfe42d1e3..06d691411fa4 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -18,19 +18,19 @@ assert stdenv.gcc.gcc != null;
 
 */
 
-with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-961-g93c85eb";});
+with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-1336-g394269d";});
 
 let snapshot = if stdenv.system == "i686-linux"
-      then "d827fbbd778b854923971873cf03bdb79c2e8575"
+      then "999ba4a0dfb70adca628138a7d5f491023621140"
       else if stdenv.system == "x86_64-linux"
-      then "1ddca522a8ba4a4f662dc17ca16b0f50f2c15f87"
+      then "55eaaed3bd6dd5a8d08e99aa4cd618d207f87d8c"
       else if stdenv.system == "i686-darwin"
-      then "597cd42301e1569df8ad090574cd535d19283387"
+      then "0581dff21a238343602ec0202a551bac93d21300"
       else if stdenv.system == "x86_64-darwin"
-      then "4bfb2aff1c3e3c57653b32adc34b399c5aeb759b"
+      then "aad290cf3f8ac4aa0661984a9799c78161ea5a72"
       else abort "no-snapshot for platform ${stdenv.system}";
-    snapshotDate = "2014-11-04";
-    snapshotRev = "1b2ad78";
+    snapshotDate = "2014-11-18";
+    snapshotRev = "9c96a79";
     snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2";
 
 in stdenv.mkDerivation {
@@ -40,8 +40,8 @@ in stdenv.mkDerivation {
 
   src = fetchgit {
     url = https://github.com/rust-lang/rust;
-    rev = "93c85eb8bdcc910a27caf6abd20207a626ae98e5";
-    sha256 = "0zj84xsyg8jpd6ixmdv7jsjrnsd4zwrac98qqmwgrd78h74g8kpq";
+    rev = "394269d16e3752a23ffa273e68f8aaefd2a510c4";
+    sha256 = "0zkz5f4gba4glhrf9f7v42qxk638q9ahgf6m0bjh8b7c3x52cv71";
   };
 
   # We need rust to build rust. If we don't provide it, configure will try to download it.
@@ -69,7 +69,7 @@ in stdenv.mkDerivation {
             ++ stdenv.lib.optional stdenv.needsPax ./grsec.HEAD.patch;
 
   postPatch = ''
-    substituteInPlace src/librustc/back/link.rs \
+    substituteInPlace src/librustc_trans/back/link.rs \
       --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc"
     substituteInPlace src/librustc_back/archive.rs \
       --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar"
diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix
index 11c3c0d8c318..d7e7ecf1ce2e 100644
--- a/pkgs/development/compilers/scala/2.10.nix
+++ b/pkgs/development/compilers/scala/2.10.nix
@@ -31,7 +31,8 @@ stdenv.mkDerivation rec {
       compared to an equivalent Java application.
     '';
     homepage = http://www.scala-lang.org/;
-    license = "BSD";
+    license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.all;
+    branch = "2.10";
   };
 }
diff --git a/pkgs/development/compilers/scala/2.9.nix b/pkgs/development/compilers/scala/2.9.nix
index 41f377dbfa3f..de5db1eff996 100644
--- a/pkgs/development/compilers/scala/2.9.nix
+++ b/pkgs/development/compilers/scala/2.9.nix
@@ -28,7 +28,8 @@ stdenv.mkDerivation rec {
       compared to an equivalent Java application.
     '';
     homepage = http://www.scala-lang.org/;
-    license = "BSD";
+    license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.all;
+    branch = "2.9";
   };
 }
diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index 499fdbc75968..e9f6c71eb2c0 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       compared to an equivalent Java application.
     '';
     homepage = http://www.scala-lang.org/;
-    license = "BSD";
+    license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/vala/0.26.nix b/pkgs/development/compilers/vala/0.26.nix
new file mode 100644
index 000000000000..48b5476fe1d0
--- /dev/null
+++ b/pkgs/development/compilers/vala/0.26.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt
+, glib, libiconvOrEmpty, libintlOrEmpty
+}:
+
+let
+  major = "0.26";
+  minor = "1";
+  sha256 = "8407abb19ab3a58bbfc0d288abb47666ef81f76d0540258c03965e7545f59e6b";
+in
+stdenv.mkDerivation rec {
+  name = "vala-${major}.${minor}";
+
+  meta = {
+    description = "Compiler for GObject type system";
+    homepage = "http://live.gnome.org/Vala";
+    license = stdenv.lib.licenses.lgpl21Plus;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ antono lethalman ];
+  };
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz";
+    inherit sha256;
+  };
+
+  nativeBuildInputs = [ pkgconfig flex bison libxslt ];
+
+  buildInputs = [ glib ]
+    ++ libiconvOrEmpty
+    ++ libintlOrEmpty;
+}