public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging

Browse Source 
Conflicts:
	pkgs/development/libraries/boost/generic.nix
This commit is contained in:
Eelco Dolstra
2014-11-11 23:48:08 +01:00
parent 5cf4905f3b ea49ac0496
commit f33fa1b66b
307 changed files with 605 additions and 4972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/agda/stdlib.nix
View File

@@ -18,7 +18,7 @@ agda.mkDerivation (self: rec {
meta = with stdenv.lib; {
homepage = "http://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary";
description = "A standard library for use with the Agda compiler.";
description = "A standard library for use with the Agda compiler";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
maintainers = with maintainers; [ jwiegley fuuzetsu ];

4
pkgs/development/compilers/mozart/binary.nix
View File

@@ -1,5 +1,7 @@
{ stdenv, fetchurl, bash, makeWrapper, coreutils, emacs, tcl, tk, boost, gmp, cacert }:
assert stdenv.isLinux;
let
version = "2.0.0";
in
@@ -23,6 +25,6 @@ stdenv.mkDerivation {
description = "The Mozart Programming System combines ongoing research in programming language design and implementation, constraint logic programming, distributed computing, and human-computer interfaces. Mozart implements the Oz language and provides both expressive power and advanced functionality.";
license = licenses.mit;
platforms = platforms.unix;
platforms = ["x86_64-linux"];
};
}

2
pkgs/development/compilers/opendylan/bin.nix
View File

@@ -35,7 +35,7 @@ stdenv.mkDerivation {
meta = {
homepage = http://opendylan.org;
description = "Dylan is a multi-paradigm functional and object-oriented programming language.";
description = "A multi-paradigm functional and object-oriented programming language";
license = stdenv.lib.licenses.mit;
};
}

2
pkgs/development/compilers/opendylan/default.nix
View File

@@ -31,7 +31,7 @@ stdenv.mkDerivation {
meta = {
homepage = http://opendylan.org;
description = "Dylan is a multi-paradigm functional and object-oriented programming language.";
description = "A multi-paradigm functional and object-oriented programming language";
license = stdenv.lib.licenses.mit;
};
}