diff --git a/flake.nix b/flake.nix
index 77654ab..c191b67 100644
--- a/flake.nix
+++ b/flake.nix
@@ -68,6 +68,43 @@
         runScript = "vivado";
       };
 
+      pyrp3 = pkgs.python3Packages.buildPythonPackage rec {
+        pname = "pyrp3";
+        version = "1.2.0";
+        pyproject = true;
+        src = pkgs.fetchFromGitHub {
+          owner = "linien-org";
+          repo = "${pname}";
+          rev = "v${version}";
+          hash = "sha256-43TTlpJ5SMAjQM71bNVvrWQyciRXM3zpuA/Dw41AEgU=";
+        };
+        nativeBuildInputs = with pkgs.python3Packages; [ setuptools wheel setuptools-scm ];
+        propagatedBuildInputs = with pkgs.python3Packages; [
+          myhdl
+          rpyc4
+          cached-property
+          numpy
+        ];
+      };
+
+      linien-server = pkgs.python3Packages.buildPythonPackage rec {
+        pname = "linien-server";
+        pyproject = true;
+        inherit (pkgs.python3Packages.linien-common) src version;
+        sourceRoot = "source/linien-server";
+        nativeBuildInputs = [ pkgs.python3Packages.setuptools ];
+        propagatedBuildInputs = with pkgs.python3Packages; [
+          appdirs
+          certifi
+          click
+          cma
+          pylpsd
+          pyrp3
+          requests
+          linien-common
+        ];
+      };
+
       not-os-configured = (import patched-not-os {
         inherit nixpkgs;
         extraModules = [
@@ -461,11 +498,10 @@
         inherit migen misoc vivado;
       };
       packages.armv7l-linux = {
-        inherit fast-servo-gateware;
+        inherit fast-servo-gateware linien-server;
       } //
       (board-package-set { board = "zc706"; }) //
       (board-package-set { board = "fast-servo"; });
-
       hydraJobs = packages.x86_64-linux // packages.armv7l-linux;
     };