Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions flake.nix
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@
inherit system;
overlays = with self.overlays; [
default
patches
];
};

Expand All@@ -57,7 +56,6 @@
inherit system;
overlays = with self.overlays; [
default
patches
debug
];
};
Expand DownExpand Up@@ -129,8 +127,6 @@
overlays = {
default = final: prev: packagesWith final;

patches = import ./packaging/nix/patches.nix;

debug = final: prev: {
jansson = addSeparateDebugInfo prev.jansson;
libmodbus = addSeparateDebugInfo prev.libmodbus;
Expand DownExpand Up@@ -229,7 +225,6 @@
imports = [ (nixDir + "/module.nix") ];
nixpkgs.overlays = [
self.overlays.default
self.overlays.patches
];
};
};
Expand Down
4 changes: 2 additions & 2 deletions packaging/deps.sh
100644 → 100755
Original file line numberDiff line numberDiff line change
Expand Up@@ -258,9 +258,9 @@ if ! pkg-config "libethercat >= 1.5.2" && \
fi

# Build & Install libiec61850
if ! pkg-config "libiec61850 >= 1.6.0" && \
if ! pkg-config "libiec61850 >= 1.6.2" && \
should_build "iec61850" "for the iec61850 node-type"; then
git clone ${GIT_OPTS} --branch v1.6.1 https://github.com/mz-automation/libiec61850.git
git clone ${GIT_OPTS} --branch v1.6.2 https://github.com/mz-automation/libiec61850.git

pushd libiec61850/third_party/mbedtls/
curl -L https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v3.6.0.tar.gz | tar -xz
Expand Down
23 changes: 0 additions & 23 deletions packaging/nix/patches.nix

This file was deleted.

31 changes: 0 additions & 31 deletions packaging/patches/libiec61850_debug_r_session.patch

This file was deleted.

Loading