From b10d800586fb508c7466a1bb48392a27224f48fb Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 26 Jul 2024 13:59:27 +0200 Subject: [PATCH] flake: update --- flake.lock | 46 +++++++++++++++++++++++----------------------- flake.nix | 6 ++++-- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 25e159b..a62330d 100644 --- a/flake.lock +++ b/flake.lock @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1713459701, - "narHash": "sha256-LjQ11ASxnv/FXfb8QnrIyMkyqSqcBPX+lFK8gu0jSQE=", + "lastModified": 1720226507, + "narHash": "sha256-yHVvNsgrpyNTXZBEokL8uyB2J6gB1wEx0KOJzoeZi1A=", "owner": "ipetkov", "repo": "crane", - "rev": "45ea0059fb325132fdc3c39faffb0941d25d08d3", + "rev": "0aed560c5c0a61c9385bddff471a13036203e11c", "type": "github" }, "original": { @@ -101,11 +101,11 @@ ] }, "locked": { - "lastModified": 1701905325, - "narHash": "sha256-lda63LmEIlDMeCgWfjr3/wb487XPllBByfrGRieyEk4=", + "lastModified": 1718008439, + "narHash": "sha256-nlh/2uD5p2SAdkn6Zuey20yaR5FFWvhL3poapDGNE4Y=", "owner": "nix-community", "repo": "disko", - "rev": "1144887c6f4d2dcbb2316a24364ef53e25b0fcfe", + "rev": "c1cfbfad7cb45f0c177b35b59ba67d1b5fc7ca82", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -500,11 +500,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1712738767, - "narHash": "sha256-H02MqBYW6ekafiO8ol8gZq1JwGM1eQYLXhHrnFouBJg=", + "lastModified": 1718803059, + "narHash": "sha256-MYvDgSPWdF0hP6vzOhpqY+2a66ZLELFj+MUP5S/+dBY=", "owner": "numtide", "repo": "nixos-anywhere", - "rev": "05854a92a58f4332e9e55ef3aef1570b8ae8bc72", + "rev": "ce18c086d8ca143d43ab20b3db20ab1e3e62c519", "type": "github" }, "original": { @@ -516,7 +516,7 @@ }, "nixos-images": { "inputs": { - "nixos-2311": [ + "nixos-stable": [ "nixos-anywhere", "nixos-stable" ], @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1702375325, - "narHash": "sha256-kEdrh6IB7xh7YDwZ0ZVCngCs+uoS9gx4ydEoJRnM1Is=", + "lastModified": 1717994219, + "narHash": "sha256-ueTu01bYU5QXdL77psMkApYHpk339xNHg/M7ZzP3uPI=", "owner": "nix-community", "repo": "nixos-images", - "rev": "d655cc02fcb9ecdcca4f3fb307e291a4b5be1339", + "rev": "e2fd329c3a39a90bb43e1e2cf47c180ed57831bf", "type": "github" }, "original": { @@ -541,16 +541,16 @@ }, "nixos-stable": { "locked": { - "lastModified": 1702233072, - "narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=", + "lastModified": 1717696253, + "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "781e2a9797ecf0f146e81425c822dca69fe4a348", + "rev": "9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -1039,11 +1039,11 @@ ] }, "locked": { - "lastModified": 1702376629, - "narHash": "sha256-9uAY8a7JN4DvLe/g4OoldqPbcNZ09YOVXID+CkIqL70=", + "lastModified": 1717850719, + "narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "390018a9398f9763bfc05ffe6443ce0622cb9ba6", + "rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 22b036b..4df5593 100644 --- a/flake.nix +++ b/flake.nix @@ -212,12 +212,14 @@ packages = let dcpj4110dw = pkgs.callPackage (self + /nix/pkgs/dcpj4110dw) {}; + craneLibFn = (inputs.crane.mkLib inputs.nixpkgs.legacyPackages.${system}).overrideToolchain; + craneLib = - inputs.crane.lib.${system}.overrideToolchain + craneLibFn inputs'.fenix.packages.stable.toolchain; craneLibOfiPass = - inputs.crane.lib.${system}.overrideToolchain + craneLibFn ( inputs'.fenix.packages.stable.toolchain # .override {