Merge pull request #15 from jkopanski/24.05

conal · Jun 6, 2024 · 1d380a8 · 1d380a8
2 parents 62dcc0f + 125dd4b
commit 1d380a8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 38 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,23 +2,15 @@
   description = "Category theory for denotational design";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs?ref=23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     utils.url = "github:numtide/flake-utils";
-    agda-stdlib-src = {
-      url = "github:agda/agda-stdlib?ref=v2.0";
-      flake = false;
-    };
-  };
+ };
 
-  outputs = { self, nixpkgs, utils, agda-stdlib-src }:
+  outputs = { self, nixpkgs, utils }:
     utils.lib.eachDefaultSystem (system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
-        standard-library = pkgs.agdaPackages.standard-library.overrideAttrs (final: prev: {
-          version = "2.0";
-          src = agda-stdlib-src;
-        });
-        agdaWithStandardLibrary = pkgs.agda.withPackages (_: [ standard-library ]);
+        agdaWithStandardLibrary = pkgs.agda.withPackages (p: [ p.standard-library ]);
 
       in {
         checks.whitespace = pkgs.stdenvNoCC.mkDerivation {
@@ -45,7 +37,7 @@
           version = "0.0.1";
           src = ./.;
 
-          buildInputs = [ standard-library ];
+          buildInputs = with pkgs.agdaPackages; [ standard-library ];
 
           everythingFile = "./src/Felix/All.agda";