update to nixos 26.05, replace naersk with crane
Some checks failed
Rust / build (push) Failing after 4s

This commit is contained in:
müde 2026-05-27 21:12:08 +02:00
commit 0457966ae9
4 changed files with 36 additions and 86 deletions

1
.gitignore vendored
View file

@ -1 +1,2 @@
/target /target
result

19
Cargo.lock generated
View file

@ -212,7 +212,7 @@ dependencies = [
"bitflags 2.11.0", "bitflags 2.11.0",
"cexpr", "cexpr",
"clang-sys", "clang-sys",
"itertools 0.13.0", "itertools 0.12.1",
"proc-macro2", "proc-macro2",
"quote", "quote",
"regex", "regex",
@ -731,9 +731,9 @@ dependencies = [
[[package]] [[package]]
name = "ffmpeg-next" name = "ffmpeg-next"
version = "8.0.0" version = "8.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d658424d233cbd993a972dd73a66ca733acd12a494c68995c9ac32ae1fe65b40" checksum = "f7c4bd5ab1ac61f29c634df1175d350ded29cf74c3c6d4f7030431a5ae3c7d5d"
dependencies = [ dependencies = [
"bitflags 2.11.0", "bitflags 2.11.0",
"ffmpeg-sys-next", "ffmpeg-sys-next",
@ -742,9 +742,9 @@ dependencies = [
[[package]] [[package]]
name = "ffmpeg-sys-next" name = "ffmpeg-sys-next"
version = "8.0.1" version = "8.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9bca20aa4ee774fe384c2490096c122b0b23cf524a9910add0686691003d797b" checksum = "a314bc0e022a33a99567ed4bd2576bd58ffd8fcff7891c29194cfecc26a62547"
dependencies = [ dependencies = [
"bindgen 0.72.1", "bindgen 0.72.1",
"cc", "cc",
@ -1072,15 +1072,6 @@ dependencies = [
"either", "either",
] ]
[[package]]
name = "itertools"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
dependencies = [
"either",
]
[[package]] [[package]]
name = "itertools" name = "itertools"
version = "0.14.0" version = "0.14.0"

77
flake.lock generated
View file

@ -1,45 +1,17 @@
{ {
"nodes": { "nodes": {
"fenix": { "crane": {
"inputs": {
"nixpkgs": [
"naersk",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": { "locked": {
"lastModified": 1752475459, "lastModified": 1779130139,
"narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=", "narHash": "sha256-BLrtr42azquO7MdGFU5a7KiMl3YpFlTeIXqy1fT5GlQ=",
"owner": "nix-community", "owner": "ipetkov",
"repo": "fenix", "repo": "crane",
"rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f", "rev": "edb38893982a3338972bb4a2ec7ce7c29ba10fd9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "ipetkov",
"repo": "fenix", "repo": "crane",
"type": "github"
}
},
"naersk": {
"inputs": {
"fenix": "fenix",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1769799857,
"narHash": "sha256-88IFXZ7Sa1vxbz5pty0Io5qEaMQMMUPMonLa3Ls/ss4=",
"owner": "nix-community",
"repo": "naersk",
"rev": "9d4ed44d8b8cecdceb1d6fd76e74123d90ae6339",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "naersk",
"type": "github" "type": "github"
} }
}, },
@ -60,45 +32,28 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1771574726, "lastModified": 1779622335,
"narHash": "sha256-D1PA3xQv/s4W3lnR9yJFSld8UOLr0a/cBWMQMXS+1Qg=", "narHash": "sha256-ViA62qtL5za7V3d5I8OA9q9JcFhsVAiL5jVHwEclWqk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c217913993d6c6f6805c3b1a3bda5e639adfde6d", "rev": "705e9929918b43bd7b715dc0a878ac870449bb03",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-25.11", "ref": "nixos-26.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"root": { "root": {
"inputs": { "inputs": {
"naersk": "naersk", "crane": "crane",
"nix-filter": "nix-filter", "nix-filter": "nix-filter",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
} }
}, },
"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"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -106,11 +61,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770228511, "lastModified": 1775636079,
"narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -2,12 +2,9 @@
description = "Flake for command line interface of the ServicePoint display."; description = "Flake for command line interface of the ServicePoint display.";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
nix-filter.url = "github:numtide/nix-filter"; nix-filter.url = "github:numtide/nix-filter";
naersk = { crane.url = "github:ipetkov/crane";
url = "github:nix-community/naersk";
inputs.nixpkgs.follows = "nixpkgs";
};
treefmt-nix = { treefmt-nix = {
url = "github:numtide/treefmt-nix"; url = "github:numtide/treefmt-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -18,7 +15,7 @@
{ {
self, self,
nixpkgs, nixpkgs,
naersk, crane,
nix-filter, nix-filter,
treefmt-nix, treefmt-nix,
}: }:
@ -53,10 +50,8 @@
packages = forAllSystems ( packages = forAllSystems (
{ pkgs, ... }: { pkgs, ... }:
let let
naersk' = pkgs.callPackage naersk { }; craneLib = crane.mkLib pkgs;
in commonArgs = {
rec {
servicepoint-cli = naersk'.buildPackage {
src = nix-filter.lib.filter { src = nix-filter.lib.filter {
root = ./.; root = ./.;
include = [ include = [
@ -67,11 +62,11 @@
./LICENSE ./LICENSE
]; ];
}; };
strictDeps = true;
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
pkg-config pkg-config
rustPlatform.bindgenHook rustPlatform.bindgenHook
]; ];
strictDeps = true;
buildInputs = buildInputs =
with pkgs; with pkgs;
[ [
@ -87,6 +82,14 @@
] ]
); );
}; };
in
rec {
servicepoint-cli = craneLib.buildPackage (
commonArgs
// {
cargoArtifacts = craneLib.buildDepsOnly commonArgs;
}
);
default = servicepoint-cli; default = servicepoint-cli;
} }