From ff26193e4847da8e18da601a2e051e964eecafce Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Fri, 13 Jun 2025 10:47:31 +0200 Subject: [PATCH 1/4] update to nixos 25.05 --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 9e70e85..daf37b8 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1739357830, - "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", + "lastModified": 1758791193, + "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", + "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index f619fe0..60cfbb6 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Flake for the servicepoint library."; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; }; outputs = From 27ffbaa080ace50edbe2f834fa1826a26928b05b Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Sun, 28 Sep 2025 22:53:29 +0200 Subject: [PATCH 2/4] change nix formatter to nixfmt-tree --- flake.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 60cfbb6..4095ef3 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ }; outputs = - inputs@{ + { self, nixpkgs, }: @@ -28,11 +28,11 @@ } ); in - rec { + { devShells = forAllSystems ( { pkgs, system }: { - default = pkgs.mkShell rec { + default = pkgs.mkShell { packages = with pkgs; [ (pkgs.symlinkJoin { name = "rust-toolchain"; @@ -55,6 +55,6 @@ } ); - formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-rfc-style); + formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-tree); }; } From 421522d963733c5a80587e24b37cde05a0834458 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Sun, 28 Sep 2025 23:07:29 +0200 Subject: [PATCH 3/4] add nix package --- flake.nix | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 4095ef3..f58d403 100644 --- a/flake.nix +++ b/flake.nix @@ -24,15 +24,40 @@ system: f rec { pkgs = nixpkgs.legacyPackages.${system}; + selfPkgs = self.packages.${system}; inherit system; } ); in { + packages = forAllSystems ( + { pkgs, selfPkgs, ... }: + { + servicepoint-binding-uniffi = pkgs.rustPlatform.buildRustPackage { + pname = "servicepoint-binding-uniffi"; + version = "0.13.1"; + + src = ./.; + cargoDeps = pkgs.rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; + + nativeBuildInputs = with pkgs; [ + pkg-config + ]; + + buildInputs = with pkgs; [ + xe + xz + ]; + }; + default = selfPkgs.servicepoint-binding-uniffi; + } + ); + devShells = forAllSystems ( - { pkgs, system }: + { pkgs, selfPkgs, ... }: { default = pkgs.mkShell { + inputsFrom = [ selfPkgs.default ]; packages = with pkgs; [ (pkgs.symlinkJoin { name = "rust-toolchain"; @@ -46,9 +71,6 @@ cargo-tarpaulin ]; }) - xe - xz - pkg-config ]; RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}"; }; From 44ef4bb6d707c46af1bed6244f17a16f26f246c1 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Sun, 28 Sep 2025 23:12:43 +0200 Subject: [PATCH 4/4] add pkgconfig --- flake.nix | 5 +++++ servicepoint-binding-uniffi.pc.in | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 servicepoint-binding-uniffi.pc.in diff --git a/flake.nix b/flake.nix index f58d403..9567822 100644 --- a/flake.nix +++ b/flake.nix @@ -48,6 +48,11 @@ xe xz ]; + + postInstall = '' + mkdir -p $out/lib/pkgconfig + sed "s:\$out:$out:g" ${./servicepoint-binding-uniffi.pc.in} | sed "s:\$version:$version:g" > $out/lib/pkgconfig/servicepoint-binding-uniffi.pc + ''; }; default = selfPkgs.servicepoint-binding-uniffi; } diff --git a/servicepoint-binding-uniffi.pc.in b/servicepoint-binding-uniffi.pc.in new file mode 100644 index 0000000..622867c --- /dev/null +++ b/servicepoint-binding-uniffi.pc.in @@ -0,0 +1,5 @@ +Name: servicepoint-binding-uniffi +Description: UniFFI bindings for the servicepoint library +Version: $version +URL: https://git.berlin.ccc.de/servicepoint/servicepoint-binding-uniffi +Libs: -L$out/lib -lservicepoint_binding_uniffi