MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

spago: 0.13.1 -> 0.14.0

Browse source
This commit is contained in:
(cdep)illabout 2020-02-10 12:54:23 +09:00 committed by Peter Simons
parent 671db18e22
commit b68c9dda98
6 changed files with 67 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -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 =

2
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file

@ -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

16
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -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: {

53
pkgs/development/tools/purescript/spago/default.nix
View file

@ -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
'';
};
}))
})

10
pkgs/development/tools/purescript/spago/spago.nix
View file

@ -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;
}

7
pkgs/development/tools/purescript/spago/update.sh
View file

@ -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."