Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "servicepoint-cli"
 description = "A command line interface for the ServicePoint display."
-version = "0.4.1"
+version = "0.4.0"
 edition = "2021"
 rust-version = "1.80.0"
 publish = true
@@ -17,11 +17,14 @@ clap = { version = "4.5", features = ["derive"] }
 env_logger = "0.11"
 log = "0.4"
 scap = "0.0.8"
-image = "0.25"
+image = "0.25.5"
 fast_image_resize = { version = "5.1", features = ["image"] }
 tungstenite = "0.26"
-ffmpeg-next = "7.1"
+ffmpeg-next = "7.1.0"
-servicepoint = "0.15.1"
+
+[dependencies.servicepoint]
+package = "servicepoint"
+version = "0.14.1"
 
 [profile.release]
 lto = true          # Enable link-time optimization

README.md

@@ -21,9 +21,14 @@ If you have set your PATH to include the ~/.cargo/bin, you can now run `servicep
 ## Running with nix
 
 ```shell
+# from CCCB Forgejo
 nix run git+https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git -- <args>
+
+# from GitHub mirror
+nix run github:kaesaecracker/servicepoint-cli -- <args>
 ```
 
+
 ## Running a debug build
 
 ```shell

flake.lock

@@ -1,40 +1,17 @@
 {
   "nodes": {
-    "fenix": {
-      "inputs": {
-        "nixpkgs": [
-          "naersk",
-          "nixpkgs"
-        ],
-        "rust-analyzer-src": "rust-analyzer-src"
-      },
-      "locked": {
-        "lastModified": 1752475459,
-        "narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=",
-        "owner": "nix-community",
-        "repo": "fenix",
-        "rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "fenix",
-        "type": "github"
-      }
-    },
     "naersk": {
       "inputs": {
-        "fenix": "fenix",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1752689277,
+        "lastModified": 1745925850,
-        "narHash": "sha256-uldUBFkZe/E7qbvxa3mH1ItrWZyT6w1dBKJQF/3ZSsc=",
+        "narHash": "sha256-cyAAMal0aPrlb1NgzMxZqeN1mAJ2pJseDhm2m6Um8T0=",
         "owner": "nix-community",
         "repo": "naersk",
-        "rev": "0e72363d0938b0208d6c646d10649164c43f4d64",
+        "rev": "38bc60bbc157ae266d4a0c96671c6c742ee17a5f",
         "type": "github"
       },
       "original": {
@@ -60,16 +37,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1757545623,
+        "lastModified": 1746183838,
-        "narHash": "sha256-mCxPABZ6jRjUQx3bPP4vjA68ETbPLNz9V2pk9tO7pRQ=",
+        "narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8cd5ce828d5d1d16feff37340171a98fc3bf6526",
+        "rev": "bf3287dac860542719fe7554e21e686108716879",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -80,23 +57,6 @@
         "nix-filter": "nix-filter",
         "nixpkgs": "nixpkgs"
       }
-    },
-    "rust-analyzer-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1752428706,
-        "narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=",
-        "owner": "rust-lang",
-        "repo": "rust-analyzer",
-        "rev": "591e3b7624be97e4443ea7b5542c191311aa141d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rust-lang",
-        "ref": "nightly",
-        "repo": "rust-analyzer",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -2,7 +2,7 @@
   description = "Flake for command line interface of the ServicePoint display.";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
     nix-filter.url = "github:numtide/nix-filter";
     naersk = {
       url = "github:nix-community/naersk";
@@ -11,7 +11,7 @@
   };
 
   outputs =
-    {
+    inputs@{
       self,
       nixpkgs,
       naersk,
@@ -42,7 +42,7 @@
           naersk' = pkgs.callPackage naersk { };
         in
         rec {
-          servicepoint-cli = naersk'.buildPackage {
+          servicepoint-cli = naersk'.buildPackage rec {
             src = nix-filter.lib.filter {
               root = ./.;
               include = [
@@ -80,14 +80,6 @@
 
       legacyPackages = packages;
 
-      nixosModules.default = {
-        nixpkgs.overlays = [ self.overlays.default ];
-      };
-
-      overlays.default = final: prev: {
-        servicepoint-cli = self.legacyPackages."${prev.system}".servicepoint-cli;
-      };
-
       devShells = forAllSystems (
         {
           pkgs,
@@ -114,12 +106,10 @@
             ];
             LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath (builtins.concatMap (d: d.buildInputs) inputsFrom)}";
             RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";
-            RUST_LOG = "all";
-            RUST_BACKTRACE = "1";
           };
         }
       );
 
-      formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-tree);
+      formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-rfc-style);
     };
 }