From b68c9dda98a2d108464e1e142b0e53ae97df79b5 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Mon, 10 Feb 2020 12:54:23 +0900 Subject: [PATCH] spago: 0.13.1 -> 0.14.0 --- .../haskell-modules/configuration-common.nix | 3 -- .../configuration-hackage2nix.yaml | 2 +- .../haskell-modules/configuration-nix.nix | 16 +++--- .../tools/purescript/spago/default.nix | 53 ++++++++++++++++--- .../tools/purescript/spago/spago.nix | 10 ++-- .../tools/purescript/spago/update.sh | 7 ++- 6 files changed, 67 insertions(+), 24 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 91e61abf1bc1..723db5ab2794 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1068,9 +1068,6 @@ self: super: { }; }; - # Tests for dhall access the network. - dhall_1_27_0 = dontCheck super.dhall_1_27_0; - # Missing test files in source distribution, fixed once 1.4.0 is bumped # https://github.com/dhall-lang/dhall-haskell/pull/997 dhall-json = diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 95dbcea342e3..18db76ca3cf4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2356,7 +2356,7 @@ extra-packages: - control-monad-free < 0.6 # newer versions don't compile with anything but GHC 7.8.x - dbus <1 # for xmonad-0.26 - deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3 - - dhall == 1.27.0 # required for spago 0.13.0. Probably can be removed when next version of spago is available. + - dhall == 1.29.0 # required for spago 0.14.0. - doctemplates == 0.8 # required by pandoc-2.9.x - generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index bc78409b3ec0..1c8775d6ca40 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -640,18 +640,22 @@ self: super: builtins.intersectAttrs super { # we can safely jailbreak spago and use the older directory package from # LTS-14. spagoWithOverrides = doJailbreak (super.spago.override { - # spago requires dhall_1_27_0. - dhall = self.dhall_1_27_0; + # spago requires dhall-1.29.0. + dhall = self.dhall_1_29_0; }); + # This defines the version of the purescript-docs-search release we are using. + # This is defined in the src/Spago/Prelude.hs file in the spago source. + docsSearchVersion = "v0.0.8"; + docsSearchAppJsFile = pkgs.fetchurl { - url = "https://github.com/spacchetti/purescript-docs-search/releases/download/v0.0.5/docs-search-app.js"; - sha256 = "11721x455qzh40vzfmralaynn9v8b5wix86r107hhs08vhryjib2"; + url = "https://github.com/spacchetti/purescript-docs-search/releases/download/${docsSearchVersion}/docs-search-app.js"; + sha256 = "00pzi7pgjicpa0mg0al80gh2q1q2lqiyb3kjarpydlmn8dfjny7v"; }; purescriptDocsSearchFile = pkgs.fetchurl { - url = "https://github.com/spacchetti/purescript-docs-search/releases/download/v0.0.5/purescript-docs-search"; - sha256 = "16p1fmdvpwz1yswav8qjsd26c9airb22xncqw1rjnbd8lcpqx0p5"; + url = "https://github.com/spacchetti/purescript-docs-search/releases/download/${docsSearchVersion}/purescript-docs-search"; + sha256 = "1hsi1hc4p1z2xbw82w2jxmmczw6mravli1r89vrkivb72sqdjya7"; }; spagoFixHpack = overrideCabal spagoWithOverrides (drv: { diff --git a/pkgs/development/tools/purescript/spago/default.nix b/pkgs/development/tools/purescript/spago/default.nix index 2fc5efedb20b..f5720837d79e 100644 --- a/pkgs/development/tools/purescript/spago/default.nix +++ b/pkgs/development/tools/purescript/spago/default.nix @@ -1,14 +1,53 @@ -{ haskellPackages -, haskell +{ haskell +, haskellPackages , lib +, nodejs +, purescript +, runCommand }: -haskell.lib.justStaticExecutables (haskell.lib.overrideCabal haskellPackages.spago (oldAttrs: { - maintainers = (oldAttrs.maintainers or []) ++ [ - lib.maintainers.cdepillabout - ]; +let + spago = + haskell.lib.justStaticExecutables + (haskell.lib.overrideCabal haskellPackages.spago (oldAttrs: { + maintainers = (oldAttrs.maintainers or []) ++ [ + lib.maintainers.cdepillabout + ]; + })); +in +spago.overrideAttrs (oldAttrs: { passthru = (oldAttrs.passthru or {}) // { updateScript = ./update.sh; + + # These tests can be run with the following command. The tests access the + # network, so they cannot be run in the nix sandbox. sudo is needed in + # order to change the sandbox option. + # + # $ sudo nix-build -A spago.passthru.tests --option sandbox relaxed + # + tests = + runCommand + "spago-tests" + { + __noChroot = true; + nativeBuildInputs = [ + nodejs + purescript + spago + ]; + } + '' + # spago expects HOME to be set because it creates a cache file under + # home. + HOME=$(pwd) + + spago --verbose init + spago --verbose build + spago --verbose test + + touch $out + ''; }; -})) +}) + diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix index 1a7ec35748ba..adf019eef572 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/development/tools/purescript/spago/spago.nix @@ -11,11 +11,11 @@ }: mkDerivation { pname = "spago"; - version = "0.13.1"; + version = "0.14.0"; src = fetchgit { - url = "https://github.com/spacchetti/spago.git"; - sha256 = "0l6sy1hz5dbnrjkvb2f44afhd48nwqx5kx1h29ns93xbbd57hci8"; - rev = "b87858609c671d8f3dc78f858ce1d8c492bd1062"; + url = "https://github.com/purescript/spago.git"; + sha256 = "12i1430prqspy73nwfxc17zf51yprhrxxcnhw4rks6jhkgwxf4a4"; + rev = "7a99343e4876a465600eaa64b0697a9f0b2a49a9"; fetchSubmodules = true; }; isLibrary = true; @@ -42,6 +42,6 @@ mkDerivation { ]; testToolDepends = [ hspec-discover ]; prePatch = "hpack"; - homepage = "https://github.com/spacchetti/spago#readme"; + homepage = "https://github.com/purescript/spago#readme"; license = stdenv.lib.licenses.bsd3; } diff --git a/pkgs/development/tools/purescript/spago/update.sh b/pkgs/development/tools/purescript/spago/update.sh index 00c9c6d85f1d..74bc01050662 100755 --- a/pkgs/development/tools/purescript/spago/update.sh +++ b/pkgs/development/tools/purescript/spago/update.sh @@ -20,11 +20,14 @@ spago_derivation_file="${script_dir}/spago.nix" old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$spago_derivation_file")" # This is the latest release version of spago on GitHub. -new_version=$(curl --silent "https://api.github.com/repos/spacchetti/spago/releases" | jq '.[0].tag_name' --raw-output) +new_version=$(curl --silent "https://api.github.com/repos/purescript/spago/releases" | jq '.[0].tag_name' --raw-output) echo "Updating spago from old version $old_version to new version $new_version." echo "Running cabal2nix and outputting to ${spago_derivation_file}..." -cabal2nix --revision "$new_version" "https://github.com/spacchetti/spago.git" > "$spago_derivation_file" +cabal2nix --revision "$new_version" "https://github.com/purescript/spago.git" > "$spago_derivation_file" + +# TODO: This should ideally also automatically update the docsSearchVersion +# from pkgs/development/haskell/configuration-nix.nix. echo "Finished."