diff --git a/flake.lock b/flake.lock index a58c9f5..8b63f6e 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1692255291, - "narHash": "sha256-JB3M8OvT5QXqbAjVSGOWKm+X7SCxsk7sbAPVQNdlMJo=", + "lastModified": 1695886107, + "narHash": "sha256-8Dc3clsOVK8qbXqvPn7tlr/A60JFy/7LYXG9D19Fv5U=", "ref": "refs/heads/master", - "rev": "ec418a9f2fb9094be93f2d6870113a388cd62a06", - "revCount": 7, + "rev": "88a3362b58f30d99084793aa10cbda3886ab65f2", + "revCount": 10, "type": "git", "url": "https://git.dripco.eu/nic/etherlab-nix" }, @@ -22,11 +22,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1653845079, - "narHash": "sha256-7ghaQZ+7JXLI9FgNH8+RQHAt3/ubT92j8NtjZleP6t4=", + "lastModified": 1697723726, + "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b62ada430501de88dfbb08cea4eb98ead3a5e3e7", + "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7886a5a..ea06802 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,9 @@ lib = nixpkgs.lib; packagePaths = lib.mapAttrs (n: v: "${./packages}/${n}") (lib.filterAttrs (n: v: v == "directory" && (builtins.readDir "${./packages}/${n}") ? "default.nix") (builtins.readDir ./packages)); in rec { - packages = lib.genAttrs systems (system: lib.mapAttrs (n: v: lib.callPackageWith ((lib.recursiveUpdate packages.${system} nixpkgs.legacyPackages.${system}) // { inherit inputs; inherit system; } // etherlab.packages.${system}) v {}) packagePaths); + packages = lib.genAttrs systems (system: + lib.mapAttrs (n: v: + lib.callPackageWith ((lib.recursiveUpdate packages.${system} nixpkgs.legacyPackages.${system}) // { inherit inputs; inherit system; } // etherlab.packages.${system}) v {}) packagePaths); legacyPackages = packages; overlay = final: prev: (lib.mapAttrs (n: v: prev.callPackage v { }) packagePaths); nixosModules = { linuxcnc = import ./modules/linuxcnc.nix; }; diff --git a/packages/linuxcnc/default.nix b/packages/linuxcnc/default.nix index 810073f..082531f 100644 --- a/packages/linuxcnc/default.nix +++ b/packages/linuxcnc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoreconfHook, wrapGAppsHook, qt5, makeWrapper, fetchFromGitHub, libtool, pkgconfig, +{ lib, stdenv, autoreconfHook, wrapGAppsHook, qt5, makeWrapper, fetchFromGitHub, libtool, pkg-config, readline_5, ncurses, libtirpc, systemd, libmodbus, libusb, glib, gtk2, gtk3, procps, kmod, sysctl, util-linux, psmisc, intltool, tcl, tk, bwidget, tkimg, tclx, tkblt, pango, cairo, boost, espeak, gst_all_1, python3Full, yapps, gobject-introspection, libGLU, xorg, libepoxy, hicolor-icon-theme, glxinfo, bash @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; buildInputs = [ - libtool pkgconfig libtirpc systemd libmodbus libusb glib gtk2 gtk3 procps kmod sysctl util-linux + libtool pkg-config libtirpc systemd libmodbus libusb glib gtk2 gtk3 procps kmod sysctl util-linux psmisc intltool tcl tk bwidget tkimg tclx tkblt pango cairo pythonPkg.pkgs.pygobject3 gobject-introspection boost_python pythonPkg.pkgs.boost pythonPkg qt5.qtbase espeak gst_all_1.gstreamer ncurses readline_5 libGLU xorg.libXmu libepoxy hicolor-icon-theme glxinfo