File tree Expand file tree Collapse file tree 3 files changed +3
-28
lines changed Expand file tree Collapse file tree 3 files changed +3
-28
lines changed Original file line number Diff line number Diff line change 18
18
nix_path : nixpkgs=channel:nixos-unstable
19
19
20
20
- name : Run pytest tests
21
- run : nix-shell --run "net-with-nginx net-with-pathod net-with- pg-${{ matrix.pg-version }} python -m pytest -vv"
21
+ run : nix-shell --run "net-with-nginx net-with-pg-${{ matrix.pg-version }} python -m pytest -vv"
22
22
23
23
# - name: Check C files are formatted
24
24
# run: nix-shell --run "net-check-format"
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1
- let
2
- oldNixpkgs = ( import ( builtins . fetchTarball {
3
- name = "2020-04-20" ;
4
- url = "https://github.com/NixOS/nixpkgs/archive/5272327b81ed355bbed5659b8d303cf2979b6953.tar.gz" ;
5
- sha256 = "0182ys095dfx02vl2a20j1hz92dx3mfgz2a6fhn31bqlp1wa8hlq" ;
6
- } ) { } ) ;
7
- nixpkgs = builtins . fetchTarball {
1
+ with import ( builtins . fetchTarball {
8
2
name = "24.05" ; # May 31 2024
9
3
url = "https://github.com/NixOS/nixpkgs/archive/refs/tags/24.05.tar.gz" ;
10
4
sha256 = "sha256:1lr1h35prqkd1mkmzriwlpvxcb34kmhc9dnr48gkm8hh089hifmx" ;
11
- } ;
12
- in with import nixpkgs { } ;
5
+ } ) { } ;
13
6
mkShell {
14
7
buildInputs =
15
8
let
@@ -23,7 +16,6 @@ mkShell {
23
16
pgWithExt = { pg } : pg . withPackages ( p : [ ( callPackage ./nix/pg_net.nix { postgresql = pg ; } ) ] ) ;
24
17
extAll = map ( x : callPackage ./nix/pgScript.nix { postgresql = pgWithExt { pg = x ; } ; } ) supportedPgVersions ;
25
18
nginxScript = callPackage ./nix/nginxScript.nix { } ;
26
- pathodScript = callPackage ./nix/pathodScript.nix { mitmproxy = oldNixpkgs . mitmproxy ; } ;
27
19
gdbScript = callPackage ./nix/gdbScript.nix { } ;
28
20
pythonDeps = with python3Packages ; [
29
21
pytest
@@ -37,7 +29,6 @@ mkShell {
37
29
pythonDeps
38
30
format . do format . doCheck
39
31
nginxScript
40
- pathodScript
41
32
gdbScript
42
33
] ;
43
34
shellHook = ''
You can’t perform that action at this time.
0 commit comments