From a4a330f63880fb92fd22065cb7d9a2d0ad22fa96 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 13 Dec 2023 12:06:33 +0100 Subject: [PATCH] Bumped nixpkgs to 23.11 --- flake.lock | 8 ++++---- flake.nix | 21 ++++++++++++--------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 642bc22..e994a05 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1685566663, - "narHash": "sha256-btHN1czJ6rzteeCuE/PNrdssqYD2nIA4w48miQAFloM=", + "lastModified": 1701282334, + "narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4ecab3273592f27479a583fb6d975d4aba3486fe", + "rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "23.05", + "ref": "23.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 88bb6c4..2ab7ddf 100644 --- a/flake.nix +++ b/flake.nix @@ -1,14 +1,7 @@ { description = "A flake for dump1090 with DL0XK patches."; inputs = { - # Pointing to the current stable release of nixpkgs. You can - # customize this to point to an older version or unstable if you - # like everything shining. - # - # E.g. - # - # nixpkgs.url = "github:NixOS/nixpkgs/unstable"; - nixpkgs.url = "github:NixOS/nixpkgs/23.05"; + nixpkgs.url = "github:NixOS/nixpkgs/23.11"; }; @@ -19,7 +12,17 @@ allSystems = [ "x86_64-linux" "aarch64-linux" "armv6l-linux" ]; crossPkgs-aarch64-linux = import nixpkgs { localSystem = "x86_64-linux"; crossSystem = "aarch64-linux"; }; - crossPkgs-armv6l-linux = import nixpkgs { localSystem = "x86_64-linux"; crossSystem = "armv6l-linux"; }; + crossPkgs-armv6l-linux = import nixpkgs { + localSystem = "x86_64-linux"; + crossSystem = { + system = "armv6l-linux"; + gcc = { + arch = "armv6k"; + fpu = "vfp"; + }; + }; + }; + in { formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;