update easy-purescirpt-nix dependency

mostly need to stop assuming i can actually build against latest
purescript, because nothing is stable
This commit is contained in:
justinwoo 2021-05-08 13:12:35 +00:00
parent 08c9997a0a
commit 3339d19826
4 changed files with 66 additions and 63 deletions

View File

@ -5,8 +5,8 @@ let
pkgs.fetchFromGitHub { pkgs.fetchFromGitHub {
owner = "justinwoo"; owner = "justinwoo";
repo = "easy-purescript-nix"; repo = "easy-purescript-nix";
rev = "cc7196bff3fdb5957aabfe22c3fa88267047fe88"; rev = "e00a54ca6bd0290e8301eff140d109c1f300e40d";
sha256 = "1xfl7rnmmcm8qdlsfn3xjv91my6lirs5ysy01bmyblsl10y2z9iw"; sha256 = "1yrnnpxkzs59ik5dj9v67ysn4viff775v24kizpl0ylf24c74928";
} }
) { ) {
inherit pkgs; inherit pkgs;
@ -20,5 +20,5 @@ in
spago2nix.mkBuildProjectOutput { spago2nix.mkBuildProjectOutput {
src = ./src; src = ./src;
purs = easy-ps.purs; purs = easy-ps.purs-0_13_8;
} }

25
ci.nix
View File

@ -1,14 +1,14 @@
{ pkgs ? import <nixpkgs> {} }: { pkgs ? import <nixpkgs> { } }:
let let
easy-ps = import ( easy-ps = import
pkgs.fetchFromGitHub { (
owner = "justinwoo"; pkgs.fetchFromGitHub {
repo = "easy-purescript-nix"; owner = "justinwoo";
rev = "cc7196bff3fdb5957aabfe22c3fa88267047fe88"; repo = "easy-purescript-nix";
sha256 = "1xfl7rnmmcm8qdlsfn3xjv91my6lirs5ysy01bmyblsl10y2z9iw"; rev = "e00a54ca6bd0290e8301eff140d109c1f300e40d";
} sha256 = "1yrnnpxkzs59ik5dj9v67ysn4viff775v24kizpl0ylf24c74928";
) { }
) {
inherit pkgs; inherit pkgs;
}; };
@ -18,5 +18,8 @@ let
in in
pkgs.mkShell { pkgs.mkShell {
buildInputs = [ easy-ps.purs spago2nix ]; buildInputs = [
easy-ps.purs-0_13_8
spago2nix
];
} }

View File

@ -11,46 +11,46 @@ let
}; };
in in
{ pkgs ? import <nixpkgs> {} { pkgs ? import <nixpkgs> { }
, dhall-json ? (easy-dhall-nix pkgs).dhall-json-simple , dhall-json ? (easy-dhall-nix pkgs).dhall-json-simple
, nodejs ? pkgs.nodejs-10_x , nodejs ? pkgs.nodejs-10_x
}: }:
let
let easy-purescript-nix = import
easy-purescript-nix = import ( (
pkgs.fetchFromGitHub { pkgs.fetchFromGitHub {
owner = "justinwoo"; owner = "justinwoo";
repo = "easy-purescript-nix"; repo = "easy-purescript-nix";
rev = "1ec689df0adf8e8ada7fcfcb513876307ea34226"; rev = "e00a54ca6bd0290e8301eff140d109c1f300e40d";
sha256 = "12hk2zbjkrq2i5fs6xb3x254lnhm9fzkcxph0a7ngxyzfykvf4hi"; sha256 = "1yrnnpxkzs59ik5dj9v67ysn4viff775v24kizpl0ylf24c74928";
} }
) { ) {
inherit pkgs; inherit pkgs;
}; };
in in
pkgs.stdenv.mkDerivation { pkgs.stdenv.mkDerivation {
name = "spago2nix"; name = "spago2nix";
src = pkgs.nix-gitignore.gitignoreSource [ ".git" ] ./.; src = pkgs.nix-gitignore.gitignoreSource [ ".git" ] ./.;
buildInputs = [ pkgs.makeWrapper ]; buildInputs = [ pkgs.makeWrapper ];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
target=$out/bin/spago2nix target=$out/bin/spago2nix
>>$target echo '#!${nodejs}/bin/node' >>$target echo '#!${nodejs}/bin/node'
>>$target echo "require('$src/bin/output.js')"; >>$target echo "require('$src/bin/output.js')";
chmod +x $target chmod +x $target
wrapProgram $target \ wrapProgram $target \
--prefix PATH : ${pkgs.lib.makeBinPath [ --prefix PATH : ${pkgs.lib.makeBinPath [
pkgs.coreutils pkgs.coreutils
pkgs.nix-prefetch-git pkgs.nix-prefetch-git
easy-purescript-nix.spago easy-purescript-nix.spago
dhall-json dhall-json
]} ]}
''; '';
} }

View File

@ -4,32 +4,32 @@
# nix-shell mkbin.nix # nix-shell mkbin.nix
# #
{ pkgs ? import <nixpkgs> {} { pkgs ? import <nixpkgs> { }
, nodejs ? pkgs.nodejs-10_x , nodejs ? pkgs.nodejs-10_x
}: }:
let
let easy-purescript-nix = import
easy-purescript-nix = import ( (
pkgs.fetchFromGitHub { pkgs.fetchFromGitHub {
owner = "justinwoo"; owner = "justinwoo";
repo = "easy-purescript-nix"; repo = "easy-purescript-nix";
rev = "1ec689df0adf8e8ada7fcfcb513876307ea34226"; rev = "e00a54ca6bd0290e8301eff140d109c1f300e40d";
sha256 = "12hk2zbjkrq2i5fs6xb3x254lnhm9fzkcxph0a7ngxyzfykvf4hi"; sha256 = "1yrnnpxkzs59ik5dj9v67ysn4viff775v24kizpl0ylf24c74928";
} }
) { ) {
inherit pkgs; inherit pkgs;
}; };
in in
pkgs.mkShell { pkgs.mkShell {
nativeBuildInputs = [ nativeBuildInputs = [
easy-purescript-nix.purs easy-purescript-nix.purs-0_13_8
easy-purescript-nix.spago easy-purescript-nix.spago
nodejs nodejs
]; ];
shellHook = '' shellHook = ''
npm install npm install
npm run mkbin npm run mkbin
exit 0 exit 0
''; '';
} }