From 9182824c6a6eae356c6b514994fc170407ee925d Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 29 Nov 2014 14:23:30 +0100 Subject: [PATCH 1/2] Update ghcjs --- pkgs/development/compilers/ghcjs/0.1.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghcjs/0.1.0.nix b/pkgs/development/compilers/ghcjs/0.1.0.nix index f89cae50c16..2c5d950b5f5 100644 --- a/pkgs/development/compilers/ghcjs/0.1.0.nix +++ b/pkgs/development/compilers/ghcjs/0.1.0.nix @@ -14,8 +14,8 @@ cabal.mkDerivation (self: rec { version = "0.1.0"; src = fetchgit { url = git://github.com/ghcjs/ghcjs.git; - rev = "c0b8ebb3e2608fdd8dc3b74b55f281b5c24be8e1"; - sha256 = "442ebdfd426ec98a431735f72ec00c7dde54ae1f0c78dd593d33077ffdb1e2a2"; + rev = "5c2d279982466e076223fcbe1e1096e22956e5a9"; + sha256 = "0bc37b4e8bd039208a126fea39850c99459265cb273ac7237939cdbaee6ef71f"; }; bootSrc = fetchgit { url = git://github.com/ghcjs/ghcjs-boot.git; From 35cdb19f033f94a8fb804eff008e07a9f511b49a Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 29 Nov 2014 14:24:31 +0100 Subject: [PATCH 2/2] Use mkdir -p instead of deprecated ensureDir --- pkgs/build-support/cabal/ghcjs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/cabal/ghcjs.nix b/pkgs/build-support/cabal/ghcjs.nix index 3c4722c214a..55e10dd1f5a 100644 --- a/pkgs/build-support/cabal/ghcjs.nix +++ b/pkgs/build-support/cabal/ghcjs.nix @@ -246,12 +246,12 @@ in ./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 installedPkgConf=$confDir/${self.fname}.installedconf local pkgConf=$confDir/${self.fname}.conf - ensureDir $confDir + mkdir -p $confDir ./Setup register --gen-pkg-config=$pkgConf if test -f $pkgConf; then echo '[]' > $installedPkgConf