diff options
author | Charles Strahan <charles.c.strahan@gmail.com> | 2014-12-27 22:14:17 -0500 |
---|---|---|
committer | Charles Strahan <charles.c.strahan@gmail.com> | 2014-12-27 22:14:17 -0500 |
commit | e92c65f37d8b76599fd5b0ba1ccf2ab6a699a14b (patch) | |
tree | 8ca26706f23c6de772d227c3e11f0de11ac54c65 /pkgs | |
parent | dd28f5ff0a51cac40d9b5df5aa9d70c9c7ad5e15 (diff) | |
download | nixlib-e92c65f37d8b76599fd5b0ba1ccf2ab6a699a14b.tar nixlib-e92c65f37d8b76599fd5b0ba1ccf2ab6a699a14b.tar.gz nixlib-e92c65f37d8b76599fd5b0ba1ccf2ab6a699a14b.tar.bz2 nixlib-e92c65f37d8b76599fd5b0ba1ccf2ab6a699a14b.tar.lz nixlib-e92c65f37d8b76599fd5b0ba1ccf2ab6a699a14b.tar.xz nixlib-e92c65f37d8b76599fd5b0ba1ccf2ab6a699a14b.tar.zst nixlib-e92c65f37d8b76599fd5b0ba1ccf2ab6a699a14b.zip |
ghcjs: remove commented-out buildLocalCabalWithArgs
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/top-level/haskell-defaults.nix | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 8c6312b18c01..255c87768eaf 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -336,27 +336,6 @@ unorderedContainers = self.unorderedContainers_0_2_5_0; vector_0_10_11_0 = null; vector = self.vector_0_10_11_0; -/* - buildLocalCabalWithArgs = { src, name, args ? {}, cabalDrvArgs ? { jailbreak = true; }, cabal2nix ? packages_ghc784.cabal2nix }: let - cabalExpr = pkgs.stdenv.mkDerivation ({ - name = "${name}.nix"; - - buildCommand = '' - ${cabal2nix}/bin/cabal2nix ${src + "/${name}.cabal"} --sha256=FILTERME \ - | grep -v FILTERME | sed \ - -e 's/licenses.proprietary/licenses.unfree/' \ - -e 's/{ cabal/{ cabal, cabalInstall, cabalDrvArgs ? {}, src/' \ - -e 's/cabal.mkDerivation (self: {/cabal.mkDerivation (self: cabalDrvArgs \/\/ {/' \ - -e 's/buildDepends = \[/buildDepends = \[ cabalInstall/' \ - -e 's/pname = \([^\n]*\)/pname = \1\n inherit src;\n/' > $out - ''; - - } // pkgs.lib.optionalAttrs pkgs.stdenv.isLinux { - LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive"; - }); - in self.callPackage cabalExpr ({ inherit src cabalDrvArgs; } // args); -*/ }; extension = self: super: { ghcjsDom = with self; super.ghcjsDom.override { |