From 12952b8b46d0484d6a7606cfa6d04820ad463984 Mon Sep 17 00:00:00 2001 From: Daniel Firth Date: Tue, 18 Jun 2024 15:50:06 +0000 Subject: [PATCH] Use latest version of Agda from horizon-advance --- flake.lock | 340 ++++++++++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 12 +- 2 files changed, 343 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index fe81d0c..7d8e0fc 100644 --- a/flake.lock +++ b/flake.lock @@ -18,17 +18,251 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1715865404, + "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_3" + }, + "locked": { + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "horizon-advance": { + "inputs": { + "flake-parts": [ + "horizon-advance", + "horizon-core", + "flake-parts" + ], + "horizon-core": "horizon-core", + "horizon-hoogle": "horizon-hoogle_2", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1718725435, + "narHash": "sha256-bHXjPT2fMX1W9UPlq0N2tyoDm+W3sZqms40TKhIv104=", + "ref": "refs/heads/master", + "rev": "f8d203d7416966c3a98de9b1221af8e6a9bd4325", + "revCount": 249, + "type": "git", + "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-advance" + }, + "original": { + "type": "git", + "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-advance" + } + }, + "horizon-build-packages": { + "inputs": { + "flake-parts": [ + "horizon-advance", + "horizon-core", + "horizon-build-packages", + "horizon-ghc", + "flake-parts" + ], + "horizon-ghc": "horizon-ghc", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1716737729, + "narHash": "sha256-SXTIu6TI4Rr3dS0uz1B9Z2hFGIfcwQb9C01HHbVLDR4=", + "ref": "refs/heads/master", + "rev": "9e75556c0249b074322829f2c1825d33de1c9ee1", + "revCount": 89, + "type": "git", + "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-build-packages" + }, + "original": { + "type": "git", + "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-build-packages" + } + }, + "horizon-core": { + "inputs": { + "flake-parts": "flake-parts_2", + "horizon-build-packages": "horizon-build-packages", + "horizon-hoogle": "horizon-hoogle", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1717010610, + "narHash": "sha256-P4/chUeLzOMNIp9tig9SOz4F9ZtweV6nSrafJd9ixzo=", + "ref": "refs/heads/master", + "rev": "0c4c5338351fcd82ddb94ada87f73f9c91e29819", + "revCount": 1367, + "type": "git", + "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core" + }, + "original": { + "type": "git", + "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core" + } + }, + "horizon-ghc": { + "inputs": { + "flake-parts": [ + "horizon-advance", + "horizon-core", + "horizon-build-packages", + "horizon-ghc", + "nixica", + "flake-parts" + ], + "nixica": "nixica", + "nixpkgs": [ + "horizon-advance", + "horizon-core", + "horizon-build-packages", + "horizon-ghc", + "nixica", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1716628408, + "narHash": "sha256-owaGnYzy8NQxaB9KpdsMdDJ5i2WWb9OBrCmAlrdY9OA=", + "ref": "refs/heads/master", + "rev": "1ff3a6b692dbb3fe21533e84502d5c1f4790c4a9", + "revCount": 101, + "type": "git", + "url": "https://gitlab.horizon-haskell.net/ghc/horizon-ghc" + }, + "original": { + "type": "git", + "url": "https://gitlab.horizon-haskell.net/ghc/horizon-ghc" + } + }, + "horizon-hoogle": { + "locked": { + "lastModified": 1701521742, + "narHash": "sha256-huf/95jYL7mY0AHSziJYXx4m/sP+G+YAbJb+Q5Ph/Jg=", + "ref": "refs/heads/master", + "rev": "ddf3b08c6458c1a9e0d881f968c050bc828b9b8e", + "revCount": 2, + "type": "git", + "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle" + }, + "original": { + "type": "git", + "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle" + } + }, + "horizon-hoogle_2": { + "locked": { + "lastModified": 1701521742, + "narHash": "sha256-huf/95jYL7mY0AHSziJYXx4m/sP+G+YAbJb+Q5Ph/Jg=", + "ref": "refs/heads/master", + "rev": "ddf3b08c6458c1a9e0d881f968c050bc828b9b8e", + "revCount": 2, + "type": "git", + "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle" + }, + "original": { + "type": "git", + "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle" + } + }, + "lint-utils": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "horizon-advance", + "horizon-core", + "horizon-build-packages", + "horizon-ghc", + "nixica", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1708583908, + "narHash": "sha256-zuNxxkt/wS8Z5TbGarf4QZVDt1R65dDkEw/s2T/tCW4=", + "owner": "homotopic", + "repo": "lint-utils", + "rev": "2d77caa3644065ee0f462cc5ea654280c59127b2", + "type": "github" + }, + "original": { + "owner": "homotopic", + "repo": "lint-utils", + "type": "github" + } + }, + "nixica": { + "inputs": { + "flake-parts": "flake-parts_3", + "lint-utils": "lint-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1709796500, + "narHash": "sha256-No1tx+wo5DjOCPAF6ayhQlRMB3jD6kKdp/9bh/dSN9c=", + "ref": "refs/heads/master", + "rev": "688f425ae7fdc0bb76b907863d27c5efaa19ce8a", + "revCount": 17, + "type": "git", + "url": "https://gitlab.horizon-haskell.net/nix/nixica-library" + }, + "original": { + "type": "git", + "url": "https://gitlab.horizon-haskell.net/nix/nixica-library" + } + }, "nixpkgs": { "locked": { - "lastModified": 1718717814, - "narHash": "sha256-xB7AzKY4BP7yypo6g+sk1tnVK54sBIJMeEBB5CdbhT4=", - "owner": "nixos", + "lastModified": 1708992772, + "narHash": "sha256-TWy2VNWAzNOPbZ1InbJtm7GYOyIG/BWKPCwmNDCnDLs=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "88af533d8ae8d1e7e4648decf7817ebff91abf56", + "rev": "7e5ed63169046d8250ded004cfbd5f8b13b264e7", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", + "ref": "haskell-updates", "repo": "nixpkgs", "type": "github" } @@ -45,10 +279,104 @@ "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" } }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1714640452, + "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" + } + }, + "nixpkgs-lib_3": { + "locked": { + "dir": "lib", + "lastModified": 1706550542, + "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1716596003, + "narHash": "sha256-WW4LMtqDXBqXQ1TlMpCYZhpkwxQsr77RvLb8UfdaSXs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "edc6c261ab4ffb277af409e37a52718a91b255bc", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "haskell-updates", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1716941663, + "narHash": "sha256-gwGF1JseZqX7xAGxH6Rqec1MHpHCsrv9DeynO3aTZsA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a3713f011c88039a21cadbaf012a962c903747e5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "haskell-updates", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1716941663, + "narHash": "sha256-gwGF1JseZqX7xAGxH6Rqec1MHpHCsrv9DeynO3aTZsA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a3713f011c88039a21cadbaf012a962c903747e5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "haskell-updates", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1718717814, + "narHash": "sha256-xB7AzKY4BP7yypo6g+sk1tnVK54sBIJMeEBB5CdbhT4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "88af533d8ae8d1e7e4648decf7817ebff91abf56", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs" + "horizon-advance": "horizon-advance", + "nixpkgs": "nixpkgs_5" } } }, diff --git a/flake.nix b/flake.nix index cbc43bb..01230da 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,14 @@ description = "Hydra Formal Specification in Agda"; + nixConfig = { + extra-substituters = "https://horizon.cachix.org"; + extra-trusted-public-keys = "horizon.cachix.org-1:MeEEDRhRZTgv/FFGCv3479/dmJDfJ82G6kfUDxMSAw0="; + }; + inputs = { flake-parts.url = "github:hercules-ci/flake-parts"; + horizon-advance.url = "git+https://gitlab.horizon-haskell.net/package-sets/horizon-advance"; nixpkgs.url = "github:nixos/nixpkgs"; }; @@ -13,14 +19,14 @@ "aarch64-darwin" "x86_64-linux" ]; - perSystem = { pkgs, ... }: + perSystem = { pkgs, system, ... }: rec { packages = { - hydra-agda-spec = pkgs.agdaPackages.mkDerivation { + hydra-agda-spec = pkgs.stdenv.mkDerivation { pname = "hydra-formal-specification"; version = "0.0.1"; src = ./.; - buildInputs = [ pkgs.agda ]; + buildInputs = [ inputs.horizon-advance.packages.${system}.Agda ]; meta = { }; buildPhase = '' agda --latex Hydra/Protocol/Main.lagda