Skip to content

chore: update nixpkgs to 26.05 #721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
icewind1991 merged 1 commit into from
Jun 23, 2026
Merged

chore: update nixpkgs to 26.05 #721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

249 changes: 140 additions & 109 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
utils.url = "github:numtide/flake-utils";
naersk.url = "github:nix-community/naersk";
naersk.inputs.nixpkgs.follows = "nixpkgs";
Expand All @@ -12,125 +12,156 @@
cross-naersk.inputs.naersk.follows = "naersk";
};

outputs = {
self,
nixpkgs,
utils,
naersk,
rust-overlay,
cross-naersk,
}:
utils.lib.eachDefaultSystem (system: let
overlays = [(import rust-overlay)];
pkgs = import nixpkgs {
inherit system overlays;
};
lib = pkgs.lib;

hostTarget = pkgs.stdenv.hostPlatform.config;
targets = [
"x86_64-unknown-linux-musl"
"i686-unknown-linux-musl"
"armv7-unknown-linux-musleabihf"
"aarch64-unknown-linux-musl"
"x86_64-unknown-freebsd"
];
clientTargets = [
"x86_64-unknown-linux-musl"
"i686-unknown-linux-musl"
"armv7-unknown-linux-musleabihf"
"aarch64-unknown-linux-musl"
"x86_64-unknown-freebsd"
"x86_64-pc-windows-gnu"
];

inherit (builtins) listToAttrs fromTOML readFile;
inherit (lib.attrsets) genAttrs nameValuePair;
inherit (lib.lists) map;
inherit (cross-naersk') execSufficForTarget;
outputs =
{
self,
nixpkgs,
utils,
naersk,
rust-overlay,
cross-naersk,
}:
utils.lib.eachDefaultSystem (
system:
let
overlays = [ (import rust-overlay) ];
pkgs = import nixpkgs {
inherit system overlays;
};
lib = pkgs.lib;

artifactForTarget = target: "notify_push";
assetNameForTarget = target: "notify_push-${target}";
hostTarget = pkgs.stdenv.hostPlatform.config;
targets = [
"x86_64-unknown-linux-musl"
"i686-unknown-linux-musl"
"armv7-unknown-linux-musleabihf"
"aarch64-unknown-linux-musl"
"x86_64-unknown-freebsd"
];
clientTargets = [
"x86_64-unknown-linux-musl"
"i686-unknown-linux-musl"
"armv7-unknown-linux-musleabihf"
"aarch64-unknown-linux-musl"
"x86_64-unknown-freebsd"
"x86_64-pc-windows-gnu"
];

cross-naersk' = pkgs.callPackage cross-naersk {
inherit naersk;
toolchain = pkgs.rust-bin.stable.latest.default;
};
inherit (builtins) listToAttrs fromTOML readFile;
inherit (lib.attrsets) genAttrs nameValuePair;
inherit (lib.lists) map;
inherit (cross-naersk') execSufficForTarget;

src = lib.sources.sourceByRegex (lib.cleanSource ./.) ["Cargo.*" "(src|tests|test_client|build.rs|appinfo)(/.*)?"];
artifactForTarget = target: "notify_push";
assetNameForTarget = target: "notify_push-${target}";

nearskOpt = {
pname = "notify_push";
inherit src;
};
testClientOpts = nearskOpt // {
cargoBuildOptions = x: x ++ ["-p" "test_client"];
};
buildServer = target: (cross-naersk'.buildPackage target) nearskOpt;
buildTestClient = target: (cross-naersk'.buildPackage target) testClientOpts;
hostNaersk = cross-naersk'.hostNaersk;
cross-naersk' = pkgs.callPackage cross-naersk {
inherit naersk;
toolchain = pkgs.rust-bin.stable.latest.default;
};

checks = ["check" "clippy" "test"];
src = lib.sources.sourceByRegex (lib.cleanSource ./.) [
"Cargo.*"
"(src|tests|test_client|build.rs|appinfo)(/.*)?"
];

msrv = (fromTOML (readFile ./Cargo.toml)).package.rust-version;
msrvToolchain = pkgs.rust-bin.stable."${msrv}".default;
naerskMsrv = let
toolchain = msrvToolchain;
in
pkgs.callPackage naersk {
cargo = toolchain;
rustc = toolchain;
nearskOpt = {
pname = "notify_push";
inherit src;
};
testClientOpts = nearskOpt // {
cargoBuildOptions =
x:
x
++ [
"-p"
"test_client"
];
};
buildServer = target: (cross-naersk'.buildPackage target) nearskOpt;
buildTestClient = target: (cross-naersk'.buildPackage target) testClientOpts;
hostNaersk = cross-naersk'.hostNaersk;

testClientArtifactForTarget = target: "test_client${execSufficForTarget target}";
checks = [
"check"
"clippy"
"test"
];

in rec {
# `nix build`
packages =
# cross compile notify_push for all targets
(genAttrs targets buildServer) //
# cross compile build test_client for all test_client-targets
(listToAttrs (map (target: nameValuePair "test_client-${target}" (buildTestClient target)) clientTargets)) //
# check,test,clippy for notify_push
(genAttrs checks (mode: hostNaersk.buildPackage (nearskOpt // { inherit mode;}))) //
# check,test,clippy for test_client
(listToAttrs (map (mode: nameValuePair "test_client-${mode}" (hostNaersk.buildPackage (testClientOpts // { inherit mode;}))) checks))
// rec {
notify_push = hostNaersk.buildPackage nearskOpt;
test_client = hostNaersk.buildPackage testClientOpts;
checkMsrv = naerskMsrv.buildPackage (nearskOpt
// {
mode = "check";
});
default = notify_push;
};
msrv = (fromTOML (readFile ./Cargo.toml)).package.rust-version;
msrvToolchain = pkgs.rust-bin.stable."${msrv}".default;
naerskMsrv =
let
toolchain = msrvToolchain;
in
pkgs.callPackage naersk {
cargo = toolchain;
rustc = toolchain;
};

inherit targets clientTargets;
testClientMatrix = {
include = map (target: {
inherit target;
extension = execSufficForTarget target;
}) clientTargets;
};
testClientArtifactForTarget = target: "test_client${execSufficForTarget target}";

devShells = {
default = cross-naersk'.mkShell ["x86_64-unknown-linux-gnu"] {
nativeBuildInputs = with pkgs; [
(rust-bin.stable.latest.default.override {targets = targets ++ [hostTarget];})
krankerl
cargo-edit
cargo-outdated
cargo-audit
bacon
php
phpPackages.composer
];
in
rec {
# `nix build`
packages =
# cross compile notify_push for all targets
(genAttrs targets buildServer)
//
# cross compile build test_client for all test_client-targets
(listToAttrs (
map (target: nameValuePair "test_client-${target}" (buildTestClient target)) clientTargets
))
//
# check,test,clippy for notify_push
(genAttrs checks (mode: hostNaersk.buildPackage (nearskOpt // { inherit mode; })))
//
# check,test,clippy for test_client
(listToAttrs (
map (
mode:
nameValuePair "test_client-${mode}" (hostNaersk.buildPackage (testClientOpts // { inherit mode; }))
) checks
))
// rec {
notify_push = hostNaersk.buildPackage nearskOpt;
test_client = hostNaersk.buildPackage testClientOpts;
checkMsrv = naerskMsrv.buildPackage (
nearskOpt
// {
mode = "check";
}
);
default = notify_push;
};

inherit targets clientTargets;
testClientMatrix = {
include = map (target: {
inherit target;
extension = execSufficForTarget target;
}) clientTargets;
};
msrv = cross-naersk'.mkShell ["x86_64-unknown-linux-gnu"] {
nativeBuildInputs = with pkgs; [
msrvToolchain
];

devShells = {
default = cross-naersk'.mkShell [ "x86_64-unknown-linux-gnu" ] {
nativeBuildInputs = with pkgs; [
(rust-bin.stable.latest.default.override { targets = targets ++ [ hostTarget ]; })
krankerl
cargo-edit
cargo-outdated
cargo-audit
bacon
php
phpPackages.composer
];
};
msrv = cross-naersk'.mkShell [ "x86_64-unknown-linux-gnu" ] {
nativeBuildInputs = with pkgs; [
msrvToolchain
];
};
};
};
});
}
);
}
Loading