From 29e7a7d92a47cca3f8a5045ba7b7db1eadc449f2 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 9 Apr 2024 23:48:40 +0200 Subject: [PATCH] nix: Replace our ethercat package which the one packaged in nixpkgs Signed-off-by: Steffen Vogel --- flake.lock | 24 +++--------------------- flake.nix | 9 --------- packaging/nix/ethercat.nix | 31 ------------------------------- 3 files changed, 3 insertions(+), 61 deletions(-) delete mode 100644 packaging/nix/ethercat.nix diff --git a/flake.lock b/flake.lock index 30c61f57c..447a49cc0 100644 --- a/flake.lock +++ b/flake.lock @@ -1,29 +1,12 @@ { "nodes": { - "ethercat": { - "flake": false, - "locked": { - "lastModified": 1694079333, - "narHash": "sha256-6F3zBhnU4CFpiO+Cnbd6ecUuiGH/KUntpPfuSYZ+rAI=", - "owner": "etherlab.org", - "repo": "ethercat", - "rev": "722b2d607c4fc004ebf5204aaede0059c02274f4", - "type": "gitlab" - }, - "original": { - "owner": "etherlab.org", - "ref": "stable-1.5", - "repo": "ethercat", - "type": "gitlab" - } - }, "nixpkgs": { "locked": { - "lastModified": 1711370797, - "narHash": "sha256-2xu0jVSjuKhN97dqc4bVtvEH52Rwh6+uyI1XCnzoUyI=", + "lastModified": 1712666087, + "narHash": "sha256-WwjUkWsjlU8iUImbivlYxNyMB1L5YVqE8QotQdL9jWc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c726225724e681b3626acc941c6f95d2b0602087", + "rev": "a76c4553d7e741e17f289224eda135423de0491d", "type": "github" }, "original": { @@ -35,7 +18,6 @@ }, "root": { "inputs": { - "ethercat": "ethercat", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index 7cca67798..96405bc72 100644 --- a/flake.nix +++ b/flake.nix @@ -5,11 +5,6 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - - ethercat = { - url = "gitlab:etherlab.org/ethercat/stable-1.5"; - flake = false; - }; }; outputs = { @@ -85,10 +80,6 @@ withAllHooks = true; withAllNodes = true; }; - - ethercat = pkgs.callPackage (nixDir + "/ethercat.nix") { - src = inputs.ethercat; - }; }; in { # Standard flake attribute for normal packages (not cross-compiled) diff --git a/packaging/nix/ethercat.nix b/packaging/nix/ethercat.nix deleted file mode 100644 index f8f099139..000000000 --- a/packaging/nix/ethercat.nix +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-FileCopyrightText: 2023 OPAL-RT Germany GmbH -# SPDX-License-Identifier: Apache-2.0 -{ - autoconf, - automake, - cmake, - lib, - libtool, - pkg-config, - stdenv, - src, -}: -stdenv.mkDerivation { - pname = "ethercat"; - version = "villas"; - src = src; - separateDebugInfo = true; - nativeBuildInputs = [autoconf automake libtool pkg-config]; - preConfigure = '' - bash ./bootstrap - ''; - configureFlags = [ - "--enable-userlib=yes" - "--enable-kernel=no" - ]; - meta = with lib; { - description = "IgH EtherCAT Master for Linux"; - homepage = "https://etherlab.org/master"; - license = licenses.gpl2Only; - }; -}