From a57a766245eb9c738d926dd30a8525f0ec529a6e Mon Sep 17 00:00:00 2001 From: Roman Lubij Date: Mon, 9 Feb 2026 13:36:59 +0100 Subject: [PATCH] packages: add fet for timetable planning --- flake.lock | 97 ++++++++++++++++++++++++++++++++++++-------- flake.nix | 3 ++ flakes/fet/flake.nix | 84 ++++++++++++++++++++++++++++++++++++++ modules/packages.nix | 2 + 4 files changed, 170 insertions(+), 16 deletions(-) create mode 100644 flakes/fet/flake.nix diff --git a/flake.lock b/flake.lock index 167bf6c..7563266 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ "czkawka-src": { "flake": false, "locked": { - "lastModified": 1770285649, - "narHash": "sha256-OGvDPAU68pXm1jCotJdtMfQe+5jsF455hz4Mx1AncEY=", + "lastModified": 1770553979, + "narHash": "sha256-Y1iqHvN5rhcOmawAnSznsk44Kr1rwPVYPm/2UpwExUg=", "owner": "qarmin", "repo": "czkawka", - "rev": "76f4e03bea141bdfda4f54d27b2139dc8cfb0a8b", + "rev": "a33c1f0566876fbe7b783b0e02c695f489ad1096", "type": "github" }, "original": { @@ -55,6 +55,21 @@ "type": "github" } }, + "fet": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "path": "./flakes/fet", + "type": "path" + }, + "original": { + "path": "./flakes/fet", + "type": "path" + }, + "parent": [] + }, "flake-utils": { "inputs": { "systems": "systems" @@ -73,6 +88,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "naersk": { "inputs": { "fenix": "fenix", @@ -112,11 +145,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -128,11 +161,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1770328555, - "narHash": "sha256-FkRxi4byWqMol4IFoWTAS72iBHoGImK6ZT1RK5gkIgY=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "60dbab5d04ffce502b6cfb21a89c2d2fb2c3deb3", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1770625969, + "narHash": "sha256-3ESg5ra+raxilFcmJw1vihoGS7Abet1v0OpVn1MxPzU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "69ecaffa7deb4daa5a83cb813f8251665e3af93e", "type": "github" }, "original": { @@ -142,13 +191,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -161,8 +210,9 @@ "root": { "inputs": { "czkawka-master": "czkawka-master", + "fet": "fet", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "solaar-master": "solaar-master" } }, @@ -185,8 +235,8 @@ }, "solaar-master": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_4", "solaar-src": "solaar-src" }, "locked": { @@ -230,6 +280,21 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 180673a..115003a 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ czkawka-master.url = "path:./flakes/czkawka-master"; # czkawka-git.url = "github:qarmin/czkawka?dir=misc/nix"; solaar-master.url = "path:./flakes/solaar-master"; + fet.url = "path:./flakes/fet"; }; outputs = @@ -15,6 +16,7 @@ nix-flatpak, czkawka-master, solaar-master, + fet, ... }: { @@ -24,6 +26,7 @@ specialArgs = { inherit czkawka-master; inherit solaar-master; + inherit fet; }; modules = [ ./configuration.nix diff --git a/flakes/fet/flake.nix b/flakes/fet/flake.nix new file mode 100644 index 0000000..d13e00c --- /dev/null +++ b/flakes/fet/flake.nix @@ -0,0 +1,84 @@ +{ + description = "FET - Free Timetabling Software"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + }; + + outputs = + { + self, + nixpkgs, + flake-utils, + }: + flake-utils.lib.eachDefaultSystem ( + system: + let + pkgs = nixpkgs.legacyPackages.${system}; + in + { + packages.default = pkgs.stdenv.mkDerivation rec { + pname = "fet"; + version = "7.7.5"; # Current stable version as of Feb 2026 + + src = pkgs.fetchurl { + url = "https://lalescu.ro/liviu/fet/download/fet-${version}.tar.xz"; + sha256 = "0ajvpqjxswjxk3mjjh9mc0ks96f07d26pl8vashqs8jfc1isxrd0"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + pkgs.qt6.qmake + pkgs.qt6.wrapQtAppsHook + pkgs.copyDesktopItems + ]; + + buildInputs = [ + pkgs.qt6.qtbase + ]; + + configurePhase = '' + qmake fet.pro + ''; + + # This creates the .desktop file automatically + desktopItems = [ + (pkgs.makeDesktopItem { + name = "fet"; + exec = "fet"; + icon = "fet"; + comment = "Free Timetabling Software"; + desktopName = "FET"; + categories = [ + "Education" + "Qt" + ]; + }) + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp fet $out/bin/ + + # Install the icon (FET usually provides icons in the source) + mkdir -p $out/share/icons/hicolor/128x128/apps + cp icons/fet.png $out/share/icons/hicolor/128x128/apps/fet.png + + runHook postInstall + ''; + + meta = with pkgs.lib; { + description = "Free software for automatically scheduling timetables"; + homepage = "https://lalescu.ro/liviu/fet/"; + license = licenses.agpl3Plus; + platforms = platforms.linux; + mainProgram = "fet"; + }; + }; + } + ); +} diff --git a/modules/packages.nix b/modules/packages.nix index 91b5c74..48859cd 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -4,6 +4,7 @@ lib, czkawka-master, solaar-master, + fet, ... }: @@ -61,6 +62,7 @@ curl # czkawka czkawka-master.packages.${pkgs.stdenv.hostPlatform.system}.default + fet.packages.${pkgs.stdenv.hostPlatform.system}.default # czkawka-git.packages.${pkgs.stdenv.hostPlatform.system}.czkawka-gui-wayland ddcutil discord