From 6f0564d1f25add0fe641768e3413f75a26bfb7af Mon Sep 17 00:00:00 2001 From: zeme Date: Thu, 10 Aug 2023 09:22:21 +0200 Subject: [PATCH 1/5] Update .gitignore && add dockerApps.evaluation-test to CI --- .gitignore | 1 + nix/ci.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 31f35b1a..c0c95775 100644 --- a/.gitignore +++ b/.gitignore @@ -14,5 +14,6 @@ docker/ Makefile *.sqlite react-web/node_modules/ +.pre-commit-config.yaml *.ignore.* todo.txt diff --git a/nix/ci.nix b/nix/ci.nix index f81a3e69..6190865e 100644 --- a/nix/ci.nix +++ b/nix/ci.nix @@ -3,6 +3,6 @@ { includedPaths = [ - "dockerApps.evaluation-test" + "apps.dockerApps.evaluation-test" ]; } \ No newline at end of file From 106dcca7b0bf553b17d13143d4e9c5034643a75c Mon Sep 17 00:00:00 2001 From: zeme Date: Thu, 10 Aug 2023 10:10:33 +0200 Subject: [PATCH 2/5] Bump IOGX --- flake.lock | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 232f270c..58db5fd4 100644 --- a/flake.lock +++ b/flake.lock @@ -117,6 +117,22 @@ "type": "github" } }, + "easy-purescript-nix": { + "flake": false, + "locked": { + "lastModified": 1689933391, + "narHash": "sha256-jUuy2OzmxegEn0KT3u1uf87eGGA33+of9HodIqS3PLY=", + "owner": "justinwoo", + "repo": "easy-purescript-nix", + "rev": "5dcea83eecb56241ed72e3631d47e87bb11e45b9", + "type": "github" + }, + "original": { + "owner": "justinwoo", + "repo": "easy-purescript-nix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -416,6 +432,7 @@ "iogx": { "inputs": { "CHaP": "CHaP", + "easy-purescript-nix": "easy-purescript-nix", "flake-utils": "flake-utils", "hackage": "hackage", "haskell-language-server-1_8_0_0": "haskell-language-server-1_8_0_0", @@ -431,11 +448,11 @@ "sphinxcontrib-haddock": "sphinxcontrib-haddock" }, "locked": { - "lastModified": 1691533306, - "narHash": "sha256-xPBQprB9edO8SEcbG316hBiId+rL1hzI6E5QC56+UXg=", + "lastModified": 1691654978, + "narHash": "sha256-FoqBKVnC+R+x2Z+jql7qyjonHiRG08kuaOf63DAon+Q=", "owner": "input-output-hk", "repo": "iogx", - "rev": "ea4b683ad0ffc5cd9b7eb05aebdd3a15b66668d3", + "rev": "c7ce0c0836db8c046cdfbe86ee046334f6b95c80", "type": "github" }, "original": { From 6b0f63c2a9c6babb35f19de770187f7f569135b9 Mon Sep 17 00:00:00 2001 From: zeme Date: Thu, 10 Aug 2023 10:11:59 +0200 Subject: [PATCH 3/5] WIP --- nix/docker-files/docker.nix | 4 ++-- nix/per-system-outputs.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nix/docker-files/docker.nix b/nix/docker-files/docker.nix index 93c2b2e5..abd3a18a 100644 --- a/nix/docker-files/docker.nix +++ b/nix/docker-files/docker.nix @@ -64,8 +64,8 @@ finalImageName = "nixos/nix"; finalImageTag = "2.15.0"; }; - genFlake = inputs'.self.packages.dapps-certification-helpers-exe-generate-flake-ghc927; - buildFlake = inputs'.self.apps.dapps-certification-helpers-exe-build-flake-ghc927; + genFlake = inputs'.self.packages.generate-flake; + buildFlake = inputs'.self.packages.build-flake; image = pkgs.dockerTools.buildImage (imgAttributes // { fromImage = nixImage; diskSize = 5120; diff --git a/nix/per-system-outputs.nix b/nix/per-system-outputs.nix index 3bae58b5..08f1e836 100644 --- a/nix/per-system-outputs.nix +++ b/nix/per-system-outputs.nix @@ -3,7 +3,7 @@ { nix, inputs', l, system, ... }: { - defaultPackage = inputs'.self.packages.plutus-certification-exe-plutus-certification-ghc927; + defaultPackage = inputs'.self.packages.plutus-certification; apps.dockerApps = l.optionalAttrs (system == "x86_64-linux") nix.docker-files.docker; } \ No newline at end of file From a52013b5c301d8cb8968b9fa730691ed69a3eacc Mon Sep 17 00:00:00 2001 From: zeme Date: Thu, 10 Aug 2023 10:18:14 +0200 Subject: [PATCH 4/5] Bump IOGX --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 58db5fd4..f86ee18f 100644 --- a/flake.lock +++ b/flake.lock @@ -448,11 +448,11 @@ "sphinxcontrib-haddock": "sphinxcontrib-haddock" }, "locked": { - "lastModified": 1691654978, - "narHash": "sha256-FoqBKVnC+R+x2Z+jql7qyjonHiRG08kuaOf63DAon+Q=", + "lastModified": 1691655486, + "narHash": "sha256-y6NCaFSAe/OtrK09K9NlTpQOhiBEDVfK1DR7Kpw7Kso=", "owner": "input-output-hk", "repo": "iogx", - "rev": "c7ce0c0836db8c046cdfbe86ee046334f6b95c80", + "rev": "2f081f1e9a71f04b0adf795445956ea84fc60313", "type": "github" }, "original": { From 6fdda2c24f816753465531443d48f8040fbf4d2e Mon Sep 17 00:00:00 2001 From: zeme Date: Thu, 10 Aug 2023 14:30:50 +0200 Subject: [PATCH 5/5] Bump IOGX --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index f86ee18f..afbb85ef 100644 --- a/flake.lock +++ b/flake.lock @@ -448,11 +448,11 @@ "sphinxcontrib-haddock": "sphinxcontrib-haddock" }, "locked": { - "lastModified": 1691655486, - "narHash": "sha256-y6NCaFSAe/OtrK09K9NlTpQOhiBEDVfK1DR7Kpw7Kso=", + "lastModified": 1691670046, + "narHash": "sha256-9Gw3MjqMlmPTS6xqcVICA/61ieAc5NbD6o58w26C5is=", "owner": "input-output-hk", "repo": "iogx", - "rev": "2f081f1e9a71f04b0adf795445956ea84fc60313", + "rev": "28ca4e42185a7415c33e4337e94a3ad758d68277", "type": "github" }, "original": {