updated libraries

guilhermehas · Jul 8, 2022 · cb7593e · cb7593e
1 parent b270989
commit cb7593e
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 8 deletions.
diff --git a/agda-posts/concurrency-language.lagda.md b/agda-posts/concurrency-language.lagda.md
@@ -22,8 +22,8 @@ open import Relation.Binary.PropositionalEquality hiding ([_])
 open import Data.Product
 open import Data.List
 open import Data.Maybe
-open import Codata.Thunk
-open import Codata.Stream using (Stream; _∷_; repeat)
+open import Codata.Sized.Thunk
+open import Codata.Sized.Stream using (Stream; _∷_; repeat)
 ```
 
 # Defining the language

diff --git a/agda-posts/unit-of-measure.lagda.md b/agda-posts/unit-of-measure.lagda.md
@@ -38,7 +38,7 @@ open import Data.Integer.Instances
 open import Data.Fin
 open import Data.Fin.Properties renaming (_≟_ to _≟f_)
 open import Relation.Binary
-open import Relation.Binary.PropositionalEquality hiding (Extensionality)
+open import Relation.Binary.PropositionalEquality
 open import Relation.Nullary
 open import Relation.Nullary.Decidable
 open import Function

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,9 +2,17 @@
   description = "Guilherme blog";
   inputs = {
     flake-utils.url = "github:numtide/flake-utils";
+    cubical-src = {
+      url = github:agda/cubical;
+      flake = false;
+    };
+    stdlib-src = {
+      url = github:agda/agda-stdlib;
+      flake = false;
+    };
   };
 
-  outputs = { self, nixpkgs, flake-utils }:
+  outputs = { self, nixpkgs, flake-utils, cubical-src, stdlib-src }:
     flake-utils.lib.eachSystem [ "x86_64-linux" "x86_64-darwin" ] (system:
     let
       overlays = [
@@ -16,9 +24,14 @@
             sha256 = "07c4zn6kmgc0ivl9hw9s81msnrph2jrmc79xvdnwmmll7wrr365k";
           };
           my-src = ./.;
+
           in rec {
+          agdaNewPackages = {
+            cubical = prev.agdaPackages.cubical.overrideAttrs (_: {src = cubical-src;});
+            standard-library = prev.agdaPackages.standard-library.overrideAttrs (_: {src = stdlib-src;});
+          };
           blogToolProject = prev.haskellPackages.callPackage ./cabal.nix {};
-          agda-all = pkgs.agda.withPackages (p: with p; [ standard-library cubical ]);
+          agda-all = prev.agda.withPackages (with agdaNewPackages; [ cubical standard-library ]);
           blogProject = with prev; stdenv.mkDerivation {
             name = "guilherme-blog";
             src = my-src;
@@ -30,7 +43,7 @@
         })
       ];
       pkgs = import nixpkgs { inherit system overlays; };
-      builds = pkgs: with pkgs; { inherit blogToolProject agda-all blogProject; };
+      builds = pkgs: with pkgs; { inherit blogToolProject agda-all blogProject agdaPackagesNew; };
       builds' = pkgs: with pkgs; [ blogToolProject agda-all ];
     in  rec {
       packages = builds pkgs;

diff --git a/guilherme-blog.agda-lib b/guilherme-blog.agda-lib
@@ -1,3 +1,3 @@
 name: guilherme-blog
-depend: cubical-0.4 standard-library-1.7.1
+depend: cubical-0.4 standard-library-2.0
 include: agda-posts