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

Merge pull request #2 from basvandijk/update-ghcjs

Browse Source 
Update ghcjs && and remove deprecation warning
This commit is contained in:
ryantrinkle 2014-11-29 12:12:00 -05:00
commit 3973b89247
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/cabal/ghcjs.nix
View File

@ -246,12 +246,12 @@ in
./Setup copy ./Setup copy
ensureDir $out/bin # necessary to get it added to PATH mkdir -p $out/bin # necessary to get it added to PATH
local confDir=$out/lib/ghcjs-${ghc.ghc.version}_ghc-${ghc.ghc.ghc.version}/package.conf.d local confDir=$out/lib/ghcjs-${ghc.ghc.version}_ghc-${ghc.ghc.ghc.version}/package.conf.d
local installedPkgConf=$confDir/${self.fname}.installedconf local installedPkgConf=$confDir/${self.fname}.installedconf
local pkgConf=$confDir/${self.fname}.conf local pkgConf=$confDir/${self.fname}.conf
ensureDir $confDir mkdir -p $confDir
./Setup register --gen-pkg-config=$pkgConf ./Setup register --gen-pkg-config=$pkgConf
if test -f $pkgConf; then if test -f $pkgConf; then
echo '[]' > $installedPkgConf echo '[]' > $installedPkgConf

4
pkgs/development/compilers/ghcjs/0.1.0.nix
View File

@ -14,8 +14,8 @@ cabal.mkDerivation (self: rec {
version = "0.1.0"; version = "0.1.0";
src = fetchgit { src = fetchgit {
url = git://github.com/ghcjs/ghcjs.git; url = git://github.com/ghcjs/ghcjs.git;
rev = "c0b8ebb3e2608fdd8dc3b74b55f281b5c24be8e1"; rev = "5c2d279982466e076223fcbe1e1096e22956e5a9";
sha256 = "442ebdfd426ec98a431735f72ec00c7dde54ae1f0c78dd593d33077ffdb1e2a2"; sha256 = "0bc37b4e8bd039208a126fea39850c99459265cb273ac7237939cdbaee6ef71f";
}; };
bootSrc = fetchgit { bootSrc = fetchgit {
url = git://github.com/ghcjs/ghcjs-boot.git; url = git://github.com/ghcjs/ghcjs-boot.git;