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

Merge recent master into x-updates

Browse Source 
Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
This commit is contained in:
Vladimír Čunát
2014-07-21 12:05:57 +02:00
parent 65ac375aa2 cd3ba19ec0
commit 9b02635faa
91 changed files with 1289 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
name = "hhvm-${version}";
version = "3.1.0";
version = "3.2.0";
src = fetchgit {
url = "https://github.com/facebook/hhvm.git";
rev = "71ecbd8fb5e94b2a008387a2b5e9a8df5c6f5c7b";
sha256 = "1zv3k3bxahwyna2jgicwxm9lxs11jddpc9v41488rmzvfhdmzzkn";
rev = "01228273b8cf709aacbd3df1c51b1e690ecebac8";
sha256 = "418d5a55ac4ba5335a42329ebfb7dd96fdb8d5edbc2700251c86e9fa2ae4a967";
fetchSubmodules = true;
};
@@ -37,6 +37,8 @@ stdenv.mkDerivation rec {
patchPhase = ''
substituteInPlace hphp/util/generate-buildinfo.sh \
--replace /bin/bash ${stdenv.shell}
substituteInPlace ./configure \
--replace "/usr/bin/env bash" ${stdenv.shell}
'';
installPhase = ''
mkdir -p $out/bin $out/lib

30
pkgs/development/compilers/idris/default.nix
View File

@@ -1,27 +1,27 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint, binary
, blazeHtml, blazeMarkup, boehmgc, Cabal, cheapskate, deepseq
, filepath, gmp, happy, haskeline, languageJava, lens, libffi
, llvmGeneral, llvmGeneralPure, mtl, network, optparseApplicative
, parsers, split, text, time, transformers, trifecta
, unorderedContainers, utf8String, vector, vectorBinaryInstances
, xml, zlib
{ cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint
, base64Bytestring, binary, blazeHtml, blazeMarkup, boehmgc, Cabal
, cheapskate, deepseq, filepath, fingertree, gmp, happy, haskeline
, languageJava, lens, libffi, llvmGeneral, llvmGeneralPure, mtl
, network, optparseApplicative, parsers, split, text, time
, transformers, trifecta, unorderedContainers, utf8String, vector
, vectorBinaryInstances, xml, zlib
}:
cabal.mkDerivation (self: {
pname = "idris";
version = "0.9.13.1";
sha256 = "09528c2zxriw3l8c7dd2k5db9j1qmqhs6nbqwc7dkskzqv9snz7n";
version = "0.9.14";
sha256 = "0kfzp89sass93p9zsxq616zfix7ipi1rmjqmcjixihi01k7c0b8b";
isLibrary = true;
isExecutable = true;
buildDepends = [
annotatedWlPprint ansiTerminal ansiWlPprint binary blazeHtml
blazeMarkup Cabal cheapskate deepseq filepath haskeline
languageJava lens libffi llvmGeneral llvmGeneralPure mtl network
optparseApplicative parsers split text time transformers trifecta
unorderedContainers utf8String vector vectorBinaryInstances xml
zlib
annotatedWlPprint ansiTerminal ansiWlPprint base64Bytestring binary
blazeHtml blazeMarkup Cabal cheapskate deepseq filepath fingertree
haskeline languageJava lens libffi llvmGeneral llvmGeneralPure mtl
network optparseApplicative parsers split text time transformers
trifecta unorderedContainers utf8String vector
vectorBinaryInstances xml zlib
];
buildTools = [ happy ];
extraLibraries = [ boehmgc gmp ];