Skip to content

Commit 8f821fb

Browse files
committed
chore: remove pathod and use a single nixpkgs
Closes #106
1 parent 8c7c19e commit 8f821fb

File tree

3 files changed

+3
-28
lines changed

3 files changed

+3
-28
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
nix_path: nixpkgs=channel:nixos-unstable
1919

2020
- 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"
2222

2323
#- name: Check C files are formatted
2424
#run: nix-shell --run "net-check-format"

nix/pathodScript.nix

Lines changed: 0 additions & 16 deletions
This file was deleted.

shell.nix

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
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 {
82
name = "24.05"; # May 31 2024
93
url = "https://github.com/NixOS/nixpkgs/archive/refs/tags/24.05.tar.gz";
104
sha256 = "sha256:1lr1h35prqkd1mkmzriwlpvxcb34kmhc9dnr48gkm8hh089hifmx";
11-
};
12-
in with import nixpkgs {};
5+
}) {};
136
mkShell {
147
buildInputs =
158
let
@@ -23,7 +16,6 @@ mkShell {
2316
pgWithExt = { pg }: pg.withPackages (p: [ (callPackage ./nix/pg_net.nix { postgresql = pg;}) ]);
2417
extAll = map (x: callPackage ./nix/pgScript.nix { postgresql = pgWithExt { pg = x;}; }) supportedPgVersions;
2518
nginxScript = callPackage ./nix/nginxScript.nix {};
26-
pathodScript = callPackage ./nix/pathodScript.nix { mitmproxy = oldNixpkgs.mitmproxy; };
2719
gdbScript = callPackage ./nix/gdbScript.nix {};
2820
pythonDeps = with python3Packages; [
2921
pytest
@@ -37,7 +29,6 @@ mkShell {
3729
pythonDeps
3830
format.do format.doCheck
3931
nginxScript
40-
pathodScript
4132
gdbScript
4233
];
4334
shellHook = ''

0 commit comments

Comments
 (0)