diff options
author | Edward Tjörnhammar <ed@cflags.cc> | 2015-04-11 00:09:31 +0200 |
---|---|---|
committer | Edward Tjörnhammar <ed@cflags.cc> | 2015-04-11 00:09:31 +0200 |
commit | f13d9f28e8bf55484e619caeb5a10b4bc9eb1db7 (patch) | |
tree | 151e6eaa970fe7483075dd1e3c8c0ee20a0b1f8c /pkgs/development/tools/haskell | |
parent | c1ab1f0e848e167a74656c20c8cd1a7febcd0779 (diff) | |
download | nixlib-f13d9f28e8bf55484e619caeb5a10b4bc9eb1db7.tar nixlib-f13d9f28e8bf55484e619caeb5a10b4bc9eb1db7.tar.gz nixlib-f13d9f28e8bf55484e619caeb5a10b4bc9eb1db7.tar.bz2 nixlib-f13d9f28e8bf55484e619caeb5a10b4bc9eb1db7.tar.lz nixlib-f13d9f28e8bf55484e619caeb5a10b4bc9eb1db7.tar.xz nixlib-f13d9f28e8bf55484e619caeb5a10b4bc9eb1db7.tar.zst nixlib-f13d9f28e8bf55484e619caeb5a10b4bc9eb1db7.zip |
ihaskell: deprecate old haskellPackages expression
Diffstat (limited to 'pkgs/development/tools/haskell')
-rw-r--r-- | pkgs/development/tools/haskell/ihaskell/ng-wrapper.nix | 35 | ||||
-rw-r--r-- | pkgs/development/tools/haskell/ihaskell/wrapper.nix | 43 |
2 files changed, 21 insertions, 57 deletions
diff --git a/pkgs/development/tools/haskell/ihaskell/ng-wrapper.nix b/pkgs/development/tools/haskell/ihaskell/ng-wrapper.nix deleted file mode 100644 index 4ce78c31fe2f..000000000000 --- a/pkgs/development/tools/haskell/ihaskell/ng-wrapper.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, buildEnv, ghcWithPackages, makeWrapper, ihaskell, ipython, packages }: -let - ihaskellEnv = ghcWithPackages (self: [ - self.ihaskell - self.ihaskell-blaze - self.ihaskell-diagrams - self.ihaskell-display - ] ++ packages self); - profile = "${ihaskell.pname}-${ihaskell.version}/profile/profile.tar"; - drv = buildEnv { - name = "ihaskell-with-packages"; - paths = [ ihaskellEnv ipython ]; - postBuild = '' - tar xf ${ihaskell.src} ${profile} - mkdir -p $out/share/`dirname ${profile}` - mkdir profile - cd profile - tar xf ../${profile} - for cfg in ipython_*config.py;do - sed -i -e "1iexe = '${ihaskell}/bin/IHaskell'" $cfg - done - tar cf $out/share/${profile} . - wrapProgram "$out/bin/IHaskell" \ - --prefix PATH : "${ihaskellEnv}/bin:${ipython}/bin" \ - --set PROFILE_DIR "\$HOME/.ipython/profile_haskell" \ - --set PROFILE_TAR "$out/share/${profile}" \ - --set PROFILE_INIT "\$([ ! -d \$PROFILE_DIR ] \ - && mkdir -p \$PROFILE_DIR \ - && tar xf \$PROFILE_TAR -C \$PROFILE_DIR \ - ; [ -d \$PROFILE_DIR ] && for cfg in \$PROFILE_DIR/ipython_*config.py;do \ - sed -i -e '/.*exe.*IHaskell.*/d' \$cfg; sed -i -e \"1iexe = '${ihaskell}/bin/IHaskell'\" \$cfg;done )" \ - --set GHC_PACKAGE_PATH "\$(echo $out/lib/*/package.conf.d| tr ' ' ':'):" \ - ''; - }; -in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) \ No newline at end of file diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index b20f8fa4f507..4ce78c31fe2f 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -1,15 +1,17 @@ -{ stdenv, makeWrapper, ihaskell, ipython, ghc }: - -stdenv.mkDerivation rec { - - inherit (ihaskell) name pname src version meta; - - buildInputs = [ makeWrapper ]; - - preferLocalBuild = true; - - buildCommand = let profile = "${pname}-${version}/profile/profile.tar"; in '' - tar xf $src ${profile} +{ stdenv, buildEnv, ghcWithPackages, makeWrapper, ihaskell, ipython, packages }: +let + ihaskellEnv = ghcWithPackages (self: [ + self.ihaskell + self.ihaskell-blaze + self.ihaskell-diagrams + self.ihaskell-display + ] ++ packages self); + profile = "${ihaskell.pname}-${ihaskell.version}/profile/profile.tar"; + drv = buildEnv { + name = "ihaskell-with-packages"; + paths = [ ihaskellEnv ipython ]; + postBuild = '' + tar xf ${ihaskell.src} ${profile} mkdir -p $out/share/`dirname ${profile}` mkdir profile cd profile @@ -18,19 +20,16 @@ stdenv.mkDerivation rec { sed -i -e "1iexe = '${ihaskell}/bin/IHaskell'" $cfg done tar cf $out/share/${profile} . - makeWrapper "${ihaskell}/bin/IHaskell" "$out/bin/ihaskell" \ - --prefix PATH : "${ghc}/bin:${ihaskell}/bin:${ipython}/bin" \ - --prefix LD_LIBRARY_PATH : "${ihaskell}/lib/ghc-${ghc.version}/${name}/" \ - --add-flags "--ipython=${ipython}/bin/ipython" \ + wrapProgram "$out/bin/IHaskell" \ + --prefix PATH : "${ihaskellEnv}/bin:${ipython}/bin" \ --set PROFILE_DIR "\$HOME/.ipython/profile_haskell" \ --set PROFILE_TAR "$out/share/${profile}" \ --set PROFILE_INIT "\$([ ! -d \$PROFILE_DIR ] \ && mkdir -p \$PROFILE_DIR \ && tar xf \$PROFILE_TAR -C \$PROFILE_DIR \ ; [ -d \$PROFILE_DIR ] && for cfg in \$PROFILE_DIR/ipython_*config.py;do \ - sed -i -e '/.*exe.*IHaskell.*/d' \$cfg; sed -i -e \"1iexe = '${ihaskell}/bin/IHaskell'\" \$cfg;done ) \ - " \ - --prefix GHC_PACKAGE_PATH : "\$(${ghc.GHCGetPackages} ${ghc.version}|sed -e 's, -package-db ,:,g'|cut -b 2-):${ihaskell}/lib/ghc-${ghc.version}/package.conf.d/${pname}-${version}.installedconf" \ - --set GHC_PACKAGE_PATH "\$GHC_PACKAGE_PATH:" # always end with : to include base packages - ''; -} + sed -i -e '/.*exe.*IHaskell.*/d' \$cfg; sed -i -e \"1iexe = '${ihaskell}/bin/IHaskell'\" \$cfg;done )" \ + --set GHC_PACKAGE_PATH "\$(echo $out/lib/*/package.conf.d| tr ' ' ':'):" \ + ''; + }; +in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) \ No newline at end of file |