diff --git a/agda/flake.lock b/agda/flake.lock index 55f037c..c2ce18b 100644 --- a/agda/flake.lock +++ b/agda/flake.lock @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1698288402, - "narHash": "sha256-jIIjApPdm+4yt8PglX8pUOexAdEiAax/DXW3S/Mb21E=", + "lastModified": 1705916986, + "narHash": "sha256-iBpfltu6QvN4xMpen6jGGEb6jOqmmVQKUrXdOJ32u8w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "60b9db998f71ea49e1a9c41824d09aa274be1344", + "rev": "d7f206b723e42edb09d9d753020a84b3061a79d8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/agda/flake.nix b/agda/flake.nix index 4bc100c..8c880cc 100644 --- a/agda/flake.nix +++ b/agda/flake.nix @@ -1,7 +1,7 @@ { description = "Flake for compiling my bachelor's thesis"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; inputs.flake-utils.url = "github:numtide/flake-utils"; outputs = { self, nixpkgs, flake-utils }: diff --git a/agda/shell.nix b/agda/shell.nix index 843779e..ecb3698 100644 --- a/agda/shell.nix +++ b/agda/shell.nix @@ -3,15 +3,40 @@ with pkgs; mkShell { buildInputs = [ (agda.withPackages [ - agdaPackages.standard-library + (agdaPackages.standard-library.overrideAttrs (oldAttrs: { + version = "2.0"; + src = fetchFromGitHub { + repo = "agda-stdlib"; + owner = "agda"; + rev = "v2.0"; + hash = "sha256-TjGvY3eqpF+DDwatT7A78flyPcTkcLHQ1xcg+MKgCoE="; + }; + })) (agdaPackages.agda-categories.overrideAttrs (oldAttrs : { - version = "0.1.8"; + version = "0.2.0"; src = fetchFromGitHub { repo = "agda-categories"; - owner = "Reijix"; - rev = "102a0c46c7c9be4e47085b745abd1c486b86f0e7"; - hash = "sha256-1LzbtsqEPSfAyOztqNOG/pT6g1zsyc6lY2NwQqBZQZ8="; + owner = "agda"; + rev = "v0.2.0"; + hash = "sha256-pGwR5nPDlBwL4NbFBAZr8ZtR66qdqTm+Cd3OePjbTys="; }; + + # without this nix might use a wrong version of the stdlib to try and typecheck agda-categories + buildInputs = [ + (agda.withPackages [ + (agdaPackages.standard-library.overrideAttrs (oldAttrs: { + version = "2.0"; + src = fetchFromGitHub { + repo = "agda-stdlib"; + owner = "agda"; + rev = "v2.0"; + hash = "sha256-TjGvY3eqpF+DDwatT7A78flyPcTkcLHQ1xcg+MKgCoE="; + }; + })) + ]) + ]; + + GHCRTS = "-M6G"; })) ]) ];