Skip to content

Commit cdfad69

Browse files
committed
chore: update to xpg v1.2
1 parent 2a0d20b commit cdfad69

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

.github/workflows/main.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
3030

3131
- name: Build
32-
run: nix-shell --run "nxpg -v ${{ matrix.pg-version }} build"
32+
run: nix-shell --run "xpg -v ${{ matrix.pg-version }} build"
3333

3434
- name: Run tests
35-
run: nix-shell --run "nxpg -v ${{ matrix.pg-version }} test"
35+
run: nix-shell --run "xpg -v ${{ matrix.pg-version }} test"
3636

3737
- if: ${{ failure() }}
3838
run: cat regression.diffs
@@ -59,10 +59,10 @@ jobs:
5959
authtoken: ${{ secrets.cachix_auth_token }}
6060

6161
- name: build
62-
run: nix-shell --run "nxpg -v ${{ matrix.pg-version }} build"
62+
run: nix-shell --run "xpg -v ${{ matrix.pg-version }} build"
6363

6464
- name: run tests
65-
run: nix-shell --run "nxpg -v ${{ matrix.pg-version }} test"
65+
run: nix-shell --run "xpg -v ${{ matrix.pg-version }} test"
6666

6767
- if: ${{ failure() }}
6868
run: cat regression.diffs
@@ -89,7 +89,7 @@ jobs:
8989
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
9090

9191
- name: Coverage
92-
run: nix-shell --run "nxpg -v ${{ matrix.pg-version }} coverage"
92+
run: nix-shell --run "xpg -v ${{ matrix.pg-version }} coverage"
9393

9494
- name: Send coverage to Coveralls
9595
uses: coverallsapp/[email protected]

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -291,5 +291,5 @@ $ supautils-with-pg-13 psql -U rolecreator
291291
For coverage, execute:
292292

293293
```bash
294-
$ supautils-with-pg-17 nxpg-coverage
294+
$ supautils-with-pg-17 xpg-coverage
295295
```

nix/nxpg.nix

-11
This file was deleted.

nix/xpg.nix

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{ fetchFromGitHub, lib } :
2+
let
3+
dep = fetchFromGitHub {
4+
owner = "steve-chavez";
5+
repo = "xpg";
6+
rev = "v1.2";
7+
sha256 = "sha256-7sP+exW5CSh8c9NW4f8yr4bLcN5hJDxU5eWa8PjoNZA=";
8+
};
9+
xpg = (import dep).xpg;
10+
in
11+
xpg

shell.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ with import (builtins.fetchTarball {
55
}) {};
66
mkShell {
77
buildInputs = [
8-
(callPackage ./nix/nxpg.nix {inherit fetchFromGitHub;})
8+
(callPackage ./nix/xpg.nix {inherit fetchFromGitHub;})
99
];
1010
}

0 commit comments

Comments
 (0)