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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2016-05-12 04:03:33 +02:00
parent 81df035429 3d932ba135
commit 6c2fbfbd77
222 changed files with 17737 additions and 11667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/compilers/dev86/default.nix
View File

@@ -1,25 +1,18 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "dev86-0.16.19";
stdenv.mkDerivation rec {
name = "dev86-${version}";
version = "0.16.21";
src = fetchurl {
url = http://www.debath.co.uk/dev86/Dev86src-0.16.19.tar.gz;
sha256 = "33398b87ca85e2b69e4062cf59f2f7354af46da5edcba036c6f97bae17b8d00e";
url = "http://v3.sk/~lkundrak/dev86/Dev86src-${version}.tar.gz";
sha256 = "154dyr2ph4n0kwi8yx0n78j128kw29rk9r9f7s2gddzrdl712jr3";
};
makeFlags = "PREFIX=$(out)";
# Awful hackery to get dev86 to compile with recent gcc/binutils.
# See http://bugs.gentoo.org/214964 for some inconclusive
# discussion.
preBuild =
''
substituteInPlace makefile.in --replace "-O2" "" --replace "-O" ""
'';
meta = {
description = "Linux 8086 development environment";
homepage = http://www.debath.co.uk/;
homepage = http://v3.sk/~lkundrak/dev86/;
};
}

6
pkgs/development/compilers/elm/packages/elm-compiler.nix
View File

@@ -7,11 +7,11 @@
}:
mkDerivation {
pname = "elm-compiler";
version = "0.16";
version = "0.17";
src = fetchgit {
url = "https://github.com/elm-lang/elm-compiler";
sha256 = "b3bcdca469716f3a4195469549a9e9bc53a6030aff132ec620b9c93958a5ffe6";
rev = "df86c1c9b3cf06de3ccb78f26b4d2fac0129ce5a";
sha256 = "185mh53yyxh9m0z8808fxpds3vqyrbhahf587nnw6qzyzv63m7px";
rev = "c9c7e72c424a13255f8ee84c719f7ef48b689c1a";
};
isLibrary = true;
isExecutable = true;

10
pkgs/development/compilers/elm/packages/elm-make.nix
View File

@@ -1,22 +1,22 @@
{ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base, binary
, blaze-html, blaze-markup, bytestring, containers, directory
, elm-compiler, elm-package, fetchgit, filepath, mtl
, optparse-applicative, stdenv, text, time
, optparse-applicative, stdenv, text, time, raw-strings-qq
}:
mkDerivation {
pname = "elm-make";
version = "0.16";
version = "0.17";
src = fetchgit {
url = "https://github.com/elm-lang/elm-make";
sha256 = "fc0a6ed08b236dfab43e9af73f8e83a3b88a155695a9671a2b291dc596a75116";
rev = "54e0b33fea0cd72400ac6a3dec7643bf1b900741";
sha256 = "0y8a67y8jhnhbcqzgjymyf1ffs75vyfpyb8as2bi0mkhb7fvzi6q";
rev = "5f7b74567c43eff341048c7caceb247b51cdb8bb";
};
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
aeson ansi-terminal ansi-wl-pprint base binary blaze-html
blaze-markup bytestring containers directory elm-compiler
elm-package filepath mtl optparse-applicative text time
elm-package filepath mtl optparse-applicative text time raw-strings-qq
];
jailbreak = true;
homepage = "http://elm-lang.org";

6
pkgs/development/compilers/elm/packages/elm-package.nix
View File

@@ -6,11 +6,11 @@
}:
mkDerivation {
pname = "elm-package";
version = "0.16";
version = "0.17";
src = fetchgit {
url = "https://github.com/elm-lang/elm-package";
sha256 = "836789a823ab1d97a37907396856d8808c5573e295315c0a55e5bb44915fba4b";
rev = "6305a7954a45d1635d6a7185f2dcf136c376074f";
sha256 = "1x9jczby38ax3rbjq6hbyr593dhxazm39gy9jv00k6508dzvfg2l";
rev = "fc0924210fe5a7c0af543769b1353dbb2ddf2f0c";
};
isLibrary = true;
isExecutable = true;

24
pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
View File

@@ -1,18 +1,22 @@
{
"evancz/virtual-dom" = {
version = "2.1.0";
sha256 = "0x072vk2x9md5pxwc3f3v7gm738wr996d54avzzadfvj3qcjxpfs";
"elm-lang/virtual-dom" = {
version = "1.0.0";
sha256 = "0pa8k04g9yfixahsb30j0rbhfh6hwdh7xmm2fvk0hkidw7b4xg57";
};
"evancz/elm-markdown" = {
version = "2.0.0";
sha256 = "1x1kvwag7idxif4gsznnx0lp1c49dl9pin3aj0dq21lzradggn3g";
version = "3.0.0";
sha256 = "1wlr8sgnyq6qgh5rcjy7imfmpqxrxgmmqcfx6p541fs70yiqya12";
};
"evancz/elm-html" = {
version = "4.0.2";
sha256 = "05hzsnsqp2krd9s4xjwhmvyafpky4dc40bbk9sgsr301450cfgw6";
"elm-lang/html" = {
version = "1.0.0";
sha256 = "16cr01yxkpkmgbgclp2p80nd62a6fjw3qipzjsgksrhwv9vv4gm4";
};
"elm-lang/core" = {
version = "3.0.0";
sha256 = "18pdsnz05pjhdv575l3bqzrjd7780zgpcklg4c6lvwwcanpg42pk";
version = "4.0.0";
sha256 = "04qgzgv90qyhjk55yw4szy50h2dqdlm0a2padbgn02yf4bb1b4nw";
};
"elm-lang/svg" = {
version = "1.0.0";
sha256 = "0c29y6c58x2sq1bl29z1hr5gi2rlza8clk7ssgzmsf4xbvcczbjx";
};
}

10
pkgs/development/compilers/elm/packages/elm-reactor.nix
View File

@@ -1,22 +1,22 @@
{ mkDerivation, base, blaze-html, blaze-markup, bytestring, cmdargs
, directory, elm-compiler, fetchgit, filepath, fsnotify, mtl
, snap-core, snap-server, stdenv, text, time, transformers
, websockets, websockets-snap
, websockets, websockets-snap, elm-package, file-embed
}:
mkDerivation {
pname = "elm-reactor";
version = "0.16";
version = "0.17";
src = fetchgit {
url = "https://github.com/elm-lang/elm-reactor";
sha256 = "55605b8443dad20c78e297ce35a603cb107b0c1e57bf1c4710faaebc60396de0";
rev = "b03166296d11e240fa04cdb748e1f3c4af7afc83";
sha256 = "14hb16qwx1f4bfngh87pwjavgz6njbwdxlsy218rw3xydy3s1cn3";
rev = "4781ad2fbb6cbcde0d659dec293bbed9c847ba71";
};
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
base blaze-html blaze-markup bytestring cmdargs directory
elm-compiler filepath fsnotify mtl snap-core snap-server text time
transformers websockets websockets-snap
transformers websockets websockets-snap elm-package file-embed
];
jailbreak = true;
homepage = "http://elm-lang.org";

6
pkgs/development/compilers/elm/packages/elm-repl.nix
View File

@@ -5,11 +5,11 @@
}:
mkDerivation {
pname = "elm-repl";
version = "0.16";
version = "0.17";
src = fetchgit {
url = "https://github.com/elm-lang/elm-repl";
sha256 = "36d50cf1f86815900afd4b75da6e5cd15008b2652e97ffed0f321a28e6442874";
rev = "265de7283488964f44f0257a8b4a055ad8af984d";
sha256 = "1mxg99w36b8i43kl1nxp7fd86igi5wyj08m9mraiq58vpcgyqnzq";
rev = "95b4555cff6b6e2a55a4ea3dab00bfb39dfebf0d";
};
isLibrary = false;
isExecutable = true;

2
pkgs/development/compilers/elm/packages/release.nix
View File

@@ -1,6 +1,6 @@
{ callPackage }:
{
version = "0.16.0";
version = "0.17.0";
packages = {
elm-compiler = callPackage ./elm-compiler.nix { };
elm-package = callPackage ./elm-package.nix { };

2
pkgs/development/compilers/julia/0003-no-ldconfig.patch
View File

@@ -21,9 +21,9 @@ index 22015ff..2821192 100644
- FILE *ldc = popen("/sbin/ldconfig -r", "r");
-#endif
+ FILE *ldc = popen("true", "r");
if (ldc == NULL) return; // ignore errors in running ldconfig (other than whatever might have been printed to stderr)
while (!feof(ldc)) {
ssize_t n = getline(&line, &sz, ldc);
--
2.5.2

8
pkgs/development/compilers/julia/default.nix
View File

@@ -33,10 +33,10 @@ let
sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42";
};
libuvVersion = "9ab431a88fe255dd21e19a11f7fa2dd95774abf4";
libuvVersion = "efb40768b7c7bd9f173a7868f74b92b1c5a61a0e";
libuv = fetchurl {
url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}";
sha256 = "1bh973lbrzrjk7pcjbjnh4n92qldi81ql3aqsclywn2yg07a36h5";
sha256 = "1znkxyv1cy9pjap7afypipzsn04533ni3pqjd191fdgw2sv9cal7";
};
rmathVersion = "0.1";
@@ -48,12 +48,12 @@ in
stdenv.mkDerivation rec {
pname = "julia";
version = "0.4.2";
version = "0.4.5";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz";
sha256 = "04i5kjji5553lkdxz3wgflg1mav5ivwy2dascjy8jprqpq33aknk";
sha256 = "09gc6yf3v4in0qwhrbgjrjgvblp941di0mli4zax22mvf4dzc7s4";
};
prePatch = ''

4
pkgs/development/compilers/sbcl/default.nix
View File

@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
name = "sbcl-${version}";
version = "1.3.4";
version = "1.3.5";
src = fetchurl {
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
sha256 = "0zx6z43xfnw1b6v5d3bpjrwgqs14wxlji22nl0lr4wmzbfbzvqli";
sha256 = "0p3f9bvwdcl84n1l6imww547bdbfsbkvad8iad43jcb2hrpy3wf8";
};
patchPhase = ''