robin/infinitime-builder
1
0
Fork 0
mirror of https://github.com/icewind1991/infinitime-builder.git synced 2026-06-03 09:34:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

update to nixpkgs 24.11

Browse source
This commit is contained in:
Robin Appelman 2024-12-04 16:25:53 +01:00
commit cd3ae2c0f9
3 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
flake.lock generated
View file

@ -2,16 +2,16 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1704568152, "lastModified": 1733324681,
"narHash": "sha256-FD3mn3iUfLrjxi6OnrwWgcHzjFGteGIi9XUqj3E7xlk=", "narHash": "sha256-S/W6JGhNZRMGj6FxgCbfN+CpdDSonYV7wtiTluNCMtA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ca1841d8ab8d2184ae2fc262b9ad591e2dba0b9b", "rev": "b8bdfa8d19a9b72c59ea5ee75d1e3f2c5e53ac16",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "release-23.11", "ref": "release-24.11",
"type": "indirect" "type": "indirect"
} }
}, },
@ -41,11 +41,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1731533236,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
flake.nix
View file

@ -1,7 +1,7 @@
{ {
inputs = { inputs = {
utils.url = "github:numtide/flake-utils"; utils.url = "github:numtide/flake-utils";
nixpkgs.url = "nixpkgs/release-23.11"; nixpkgs.url = "nixpkgs/release-24.11";
}; };
outputs = { outputs = {
@ -16,6 +16,7 @@
inherit system; inherit system;
config.allowUnfreePredicate = pkg: elem (getName pkg) [ config.allowUnfreePredicate = pkg: elem (getName pkg) [
"nrf5-sdk" "nrf5-sdk"
"adafruit-nrfutil"
]; ];
}; };
in rec { in rec {

2
package.nix
View file

@ -1,7 +1,6 @@
{ {
stdenv, stdenv,
cmake, cmake,
lv_img_conv,
nodePackages, nodePackages,
python3, python3,
gcc-arm-embedded-10, gcc-arm-embedded-10,
@ -37,7 +36,6 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
lv_img_conv
nodePackages.lv_font_conv nodePackages.lv_font_conv
python3 python3
python3.pkgs.cbor python3.pkgs.cbor