Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 03eae7a38dd5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9b8c2788c47e
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Sep 23, 2017

  1. ghcjsHEAD: Bump ghcjs and ghcjs-boot revisions 

    head_stage2.nix has been regenerated to reflect changes in ghcjs
    @cocreature
    cocreature committed Sep 23, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    582c7d2 View commit details

Commits on Sep 30, 2017

  1. Merge pull request #29696 from cocreature/ghcjsHEAD 

    ghcjsHEAD: Bump ghcjs and ghcjs-boot revisions
    @cstrahan
    cstrahan authored Sep 30, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    9b8c278 View commit details
Showing with 355 additions and 231 deletions.
  1. +0 −18 pkgs/development/compilers/ghcjs/ghcjs.patch
  2. +6 −10 pkgs/development/compilers/ghcjs/head.nix
  3. +349 −203 pkgs/development/compilers/ghcjs/head_stage2.nix
18 changes: 0 additions & 18 deletions pkgs/development/compilers/ghcjs/ghcjs.patch
View file
Original file line number Diff line number Diff line change
@@ -46,24 +46,6 @@ index db8b12e..7b815c5 100644
mapM_ patchPackage =<< allPackages
preparePrimops
buildGenPrim
@@ -1141,7 +1132,7 @@ cabalStage1 pkgs = sub $ do
globalFlags <- cabalGlobalFlags
flags <- cabalInstallFlags (length pkgs == 1)
let args = globalFlags ++ ("install" : pkgs) ++
- [ "--solver=topdown" -- the modular solver refuses to install stage1 packages
+ [ "--allow-boot-library-installs"
] ++ map ("--configure-option="<>) configureOpts ++ flags
checkInstallPlan pkgs args
cabal_ args
@@ -1162,7 +1153,7 @@ cabalInstall pkgs = do
-- uses somewhat fragile parsing of --dry-run output, find a better way
checkInstallPlan :: [Package] -> [Text] -> B ()
checkInstallPlan pkgs opts = do
- plan <- cabal (opts ++ ["-v2", "--dry-run"])
+ plan <- cabal (opts ++ ["-vverbose+nowrap", "--dry-run"])
when (hasReinstalls plan || hasUnexpectedInstalls plan || hasNewVersion plan) (err plan)
where
hasReinstalls = T.isInfixOf "(reinstall)" -- reject reinstalls
@@ -1201,14 +1192,14 @@ cabalInstallFlags parmakeGhcjs = do
, "--avoid-reinstalls"
, "--builddir", "dist"
16 changes: 6 additions & 10 deletions pkgs/development/compilers/ghcjs/head.nix
View file
Original file line number Diff line number Diff line change
@@ -6,19 +6,15 @@ bootPkgs.callPackage ./base.nix {
inherit bootPkgs;

ghcjsSrc = fetchFromGitHub {
# TODO: switch back to the regular ghcjs repo
# when https://github.com/ghcjs/ghcjs/pull/573 is merged.
owner = "k0001";
owner = "ghcjs";
repo = "ghcjs";
rev = "600015e085a28da601b65a41c513d4a458fcd184";
sha256 = "01kirrg0fnfwhllvwgfqjiwzwj4yv4lyig87x61n9jp6y5shzjdx";
rev = "2b3759942fb5b2fc1a58d314d9b098d4622fa6b6";
sha256 = "15asapg0va8dvcdycsx8dgk4xcpdnhml4h31wka6vvxf5anzz8aw";
};
ghcjsBootSrc = fetchgit {
# TODO: switch back to git://github.com/ghcjs/ghcjs-boot.git
# when https://github.com/ghcjs/ghcjs-boot/pull/41 is merged.
url = git://github.com/basvandijk/ghcjs-boot.git;
rev = "19a3b157ecb807c2224daffda5baecc92b76af35";
sha256 = "16sgr8vfr1nx5ljnk8gckgjk70zpa67ix4dbr9aizkwyz41ilfrb";
url = git://github.com/ghcjs/ghcjs-boot.git;
rev = "106e144cca6529a1b9612c11aea5d6ef65b96745";
sha256 = "0gxg8iiwvm93x1dwhxypczn9qiz4m1xvj8i7cf4snfdy2jdyhi5l";
fetchSubmodules = true;
};

Loading