From 9ff0e23eb9df25800413186e23846f2198b6263f Mon Sep 17 00:00:00 2001 From: Tom Sydney Kerckhove Date: Sun, 24 Oct 2021 19:21:59 +0200 Subject: [PATCH] Trying to set up CI --- .github/workflows/nix-build.yml | 2 +- ci.nix | 4 ++-- default.nix | 2 +- nix/overlay.nix | 19 ++++++++------- nix/sources.json | 42 ++++++++++++++++----------------- stack.yaml | 6 ++--- 6 files changed, 38 insertions(+), 37 deletions(-) diff --git a/.github/workflows/nix-build.yml b/.github/workflows/nix-build.yml index 9c1cb6b..8e9851b 100644 --- a/.github/workflows/nix-build.yml +++ b/.github/workflows/nix-build.yml @@ -13,7 +13,7 @@ jobs: sudo rm -rf /opt - uses: cachix/cachix-action@v8 with: - name: yamlparse + name: autodocodec extraPullNames: validity,safe-coloured-text,sydtest signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' - run: nix-build default.nix diff --git a/ci.nix b/ci.nix index c30eec0..d3f23d4 100644 --- a/ci.nix +++ b/ci.nix @@ -16,9 +16,9 @@ let }; p = import ./nix/pkgs.nix { inherit sources; inherit pkgsf; }; in - p.yamlparseApplicativeRelease.overrideAttrs (old: { name = "yamlparse-applicative-release-${version}"; }); + p.autodocodecRelease.overrideAttrs (old: { name = "autodocodec-release-${version}"; }); in { - release = (import ./nix/pkgs.nix { inherit sources; }).yamlparseApplicativeRelease; + release = (import ./nix/pkgs.nix { inherit sources; }).autodocodecRelease; pre-commit-check = (import ./nix/pre-commit.nix { }).run; } // builtins.mapAttrs mkReleaseForVersion versions diff --git a/default.nix b/default.nix index 4f4b2d6..e7db8f4 100644 --- a/default.nix +++ b/default.nix @@ -1,4 +1,4 @@ let pkgs = import ./nix/pkgs.nix { }; in -pkgs.yamlparseApplicativePackages +pkgs.autodocodecRelease diff --git a/nix/overlay.nix b/nix/overlay.nix index 2f1c5e5..36f6241 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -2,27 +2,28 @@ final: previous: with final.haskell.lib; { - yamlparseApplicativePackages = + autodocodecPackages = let - yamlparseApplicativePkg = name: + autodocodecPkg = name: doBenchmark (buildStrictly (final.haskellPackages.callCabal2nixWithOptions name (final.gitignoreSource (../. + "/${name}")) "--no-hpack" { })); in final.lib.genAttrs [ - "yamlparse-applicative" - "yamlparse-applicative-demo" + "autodocodec" + "autodocodec-aeson" + "autodocodec-yaml" ] - yamlparseApplicativePkg; + autodocodecPkg; - yamlparseApplicativeRelease = + autodocodecRelease = final.symlinkJoin { - name = "yamlparse-applicative-release"; - paths = final.lib.attrValues final.yamlparseApplicativePackages; + name = "autodocodec-release"; + paths = final.lib.attrValues final.autodocodecPackages; }; haskellPackages = previous.haskellPackages.override ( old: { overrides = final.lib.composeExtensions (old.overrides or (_: _: { })) ( - self: super: final.yamlparseApplicativePackages + self: super: final.autodocodecPackages ); } ); diff --git a/nix/sources.json b/nix/sources.json index 89535af..a1e8bf1 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "211907489e9f198594c0eb0ca9256a1949c9d412", - "sha256": "06j7wpvj54khw0z10fjyi31kpafkr6hi1k0di13k1xp8kywvfyx8", + "rev": "9e80c4d83026fa6548bc53b1a6fab8549a6991f6", + "sha256": "04n9chlpbifgc5pa3zx6ff3rji9am6msrbn1z3x1iinjz2xjfp4p", "type": "tarball", - "url": "https://github.com/hercules-ci/gitignore.nix/archive/211907489e9f198594c0eb0ca9256a1949c9d412.tar.gz", + "url": "https://github.com/hercules-ci/gitignore.nix/archive/9e80c4d83026fa6548bc53b1a6fab8549a6991f6.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "niv": { @@ -17,10 +17,10 @@ "homepage": "https://github.com/nmattia/niv", "owner": "nmattia", "repo": "niv", - "rev": "94080ae8286024820c570a2a24ed7c36d7ad04a9", - "sha256": "0wlk52zwlrq727x3z1vg9d9qq4zw62ab5jzg4068iqb6hyb0cr0w", + "rev": "65a61b147f307d24bfd0a5cd56ce7d7b7cc61d2e", + "sha256": "17mirpsx5wyw262fpsd6n6m47jcgw8k2bwcp1iwdnrlzy4dhcgqh", "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/94080ae8286024820c570a2a24ed7c36d7ad04a9.tar.gz", + "url": "https://github.com/nmattia/niv/archive/65a61b147f307d24bfd0a5cd56ce7d7b7cc61d2e.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { @@ -29,10 +29,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa576357673d609e618d87db43210e49d4bb1789", - "sha256": "1868s3mp0lwg1jpxsgmgijzddr90bjkncf6k6zhdjqihf0i1n2np", + "rev": "95eed9b64eee24975b880308065654fd059f22c3", + "sha256": "1x59xdxh2vrnhh4j29nyq7npq70v178j5acdm2zsgamcagm3qif9", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/aa576357673d609e618d87db43210e49d4bb1789.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/95eed9b64eee24975b880308065654fd059f22c3.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "pre-commit-hooks": { @@ -41,10 +41,10 @@ "homepage": "", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "2e7fac06108b4fc81f5ff9ed9a02bc4f6ede7001", - "sha256": "17xlb7cb1n6cyw8my6ks4iacrz49a6wfqrdj2gvjc52qc91wxvj7", + "rev": "06fa80325b6fe3b28d136071dd0ce55d4817e9fd", + "sha256": "0yc4rcfwaxnz11ls9hvl8i1llqkngpbw182q9rgankgaazil6pw5", "type": "tarball", - "url": "https://github.com/cachix/pre-commit-hooks.nix/archive/2e7fac06108b4fc81f5ff9ed9a02bc4f6ede7001.tar.gz", + "url": "https://github.com/cachix/pre-commit-hooks.nix/archive/06fa80325b6fe3b28d136071dd0ce55d4817e9fd.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "safe-coloured-text": { @@ -53,10 +53,10 @@ "homepage": "https://cs-syd.eu/posts/2021-03-07-safe-coloured-text", "owner": "NorfairKing", "repo": "safe-coloured-text", - "rev": "d5788740052925aebf1dec1cf1669f66d3a35120", - "sha256": "0mrrfnvvwvdq2cf2figvan8z4jk0bypa0xmg11n3af6vsjryih43", + "rev": "7f157485e55528648a95edf3508a122b2e55779e", + "sha256": "0ayxfay78s4rlir3ls76bb5kw2fxwnj1kak9lwd86zvdqjwl02l5", "type": "tarball", - "url": "https://github.com/NorfairKing/safe-coloured-text/archive/d5788740052925aebf1dec1cf1669f66d3a35120.tar.gz", + "url": "https://github.com/NorfairKing/safe-coloured-text/archive/7f157485e55528648a95edf3508a122b2e55779e.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "sydtest": { @@ -65,10 +65,10 @@ "homepage": "", "owner": "NorfairKing", "repo": "sydtest", - "rev": "0125c6d6d17d44753c793adc8dcaa4284fef2b7d", - "sha256": "1mxvwngv7md0z7jddn4ffpqffs6qp8ka3ffbw3v545q5aijnkbhy", + "rev": "89566d227e693d776d53624656ce49efc81194c3", + "sha256": "1rmvnr6sf1w2l53lkd7dk331mixq5dmcj51mq27wyjrmvx4v6wrr", "type": "tarball", - "url": "https://github.com/NorfairKing/sydtest/archive/0125c6d6d17d44753c793adc8dcaa4284fef2b7d.tar.gz", + "url": "https://github.com/NorfairKing/sydtest/archive/89566d227e693d776d53624656ce49efc81194c3.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "validity": { @@ -77,10 +77,10 @@ "homepage": "https://www.youtube.com/watch?v=eIs9qNh17SM", "owner": "NorfairKing", "repo": "validity", - "rev": "549f92de456dd7fbf21b84f2f6fdca9a3c6506d9", - "sha256": "1gbs61kcpyd8nha1g13dsmkhslkbmhxyjfb5fmg2nwqayxvdha58", + "rev": "bafcaf3799fa76edd5968923f6efde25085815f9", + "sha256": "17qvy3qj18p7vyrfqlq82zzr4s8gmmr2qpvby2bj64r7m1nhbxr0", "type": "tarball", - "url": "https://github.com/NorfairKing/validity/archive/549f92de456dd7fbf21b84f2f6fdca9a3c6506d9.tar.gz", + "url": "https://github.com/NorfairKing/validity/archive/bafcaf3799fa76edd5968923f6efde25085815f9.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } diff --git a/stack.yaml b/stack.yaml index 3238c16..c2c41b8 100644 --- a/stack.yaml +++ b/stack.yaml @@ -6,18 +6,18 @@ packages: extra-deps: - github: NorfairKing/validity - commit: 549f92de456dd7fbf21b84f2f6fdca9a3c6506d9 + commit: bafcaf3799fa76edd5968923f6efde25085815f9 subdirs: - validity - genvalidity - genvalidity-sydtest - github: NorfairKing/safe-coloured-text - commit: b8333a8956975beab54d00fceaa835ee97c3347d + commit: 7f157485e55528648a95edf3508a122b2e55779e subdirs: - safe-coloured-text - safe-coloured-text-terminfo - github: NorfairKing/sydtest - commit: 0125c6d6d17d44753c793adc8dcaa4284fef2b7d + commit: 89566d227e693d776d53624656ce49efc81194c3 subdirs: - sydtest - sydtest-aeson