Merge branch 'develop' of github.com:zombodb/pgx into develop

pgcentralfoundation · Nov 19, 2021 · de14924 · de14924
2 parents c83b4c6 + cf42696
commit de14924
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,7 +3,7 @@
 
   inputs = {
     naersk.url = "github:nix-community/naersk";
-    nixpkgs.url = "github:NixOS/nixpkgs";
+    nixpkgs.url = "nixpkgs";
   };
 
   outputs = { self, nixpkgs, naersk }:

diff --git a/nix/templates/default/Cargo.toml b/nix/templates/default/Cargo.toml
@@ -16,11 +16,11 @@ pg14 = ["pgx/pg14", "pgx-tests/pg14" ]
 pg_test = []
 
 [dependencies]
-pgx = "0.1.22"
-pgx-macros = "0.1.22"
+pgx = "0.2"
+pgx-macros = "0.2"
 
 [dev-dependencies]
-pgx-tests = "0.1.22"
+pgx-tests = "0.2"
 tempdir = "0.3.7"
 once_cell = "1.7.2"
 

diff --git a/nix/templates/default/flake.nix b/nix/templates/default/flake.nix
@@ -3,7 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    naersk.url = "github:nmattia/naersk";
+    naersk.url = "github:nix-community/naersk";
     pgx.url = "github:zombodb/pgx/develop";
     pgx.inputs.nixpkgs.follows = "nixpkgs";
   };