diff --git a/Makefile b/Makefile index e596668..a611d2e 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ .PHONY: format lint test test_vk test_more bench bench_vk check build_host build_host_vk build_arm64 docker_build docker_lint docker_test docker_test_more docker_bench clean run_confighelper run_camera run_videofile list # https://hub.docker.com/_/debian -DOCKER_BASE_IMAGE = debian:bullseye-20240926 +DOCKER_BASE_IMAGE = debian:bullseye-20241016 # https://go.dev/dl/ -GO_VERSION = 1.22.6 -GO_ARCHIVE_SHA256 = 999805bed7d9039ec3da1a53bfbcafc13e367da52aa823cb60b68ba22d44c616 +GO_VERSION = 1.23.2 +GO_ARCHIVE_SHA256 = 542d3c1705f1c6a1c5a80d5dc62e2e45171af291e755d591c5e6531ef63b454e # https://github.com/dominikh/go-tools/releases GO_STATICCHECK_VERSION = 2024.1.1 # https://github.com/mgechev/revive/releases diff --git a/flake.lock b/flake.lock index 2ea7b7e..b81b528 100644 --- a/flake.lock +++ b/flake.lock @@ -18,7 +18,24 @@ }, "root": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "unstable": "unstable" + } + }, + "unstable": { + "locked": { + "lastModified": 1729658218, + "narHash": "sha256-9Rg+AqLqvqqJniP/OQB3GtgXoAd8IlazsHp97va042Y=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "dfffb2e7a52d29a0ef8e21ec8a0f30487b227f1a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 2471c8d..10bddb2 100644 --- a/flake.nix +++ b/flake.nix @@ -1,17 +1,22 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; }; outputs = { self, nixpkgs, + unstable, } @ inputs: let lib = nixpkgs.lib; system = "x86_64-linux"; pkgs = import inputs.nixpkgs { system = system; }; + unstablePkgs = import inputs.unstable { + system = system; + }; in { formatter.${system} = nixpkgs.legacyPackages.${system}.alejandra; @@ -26,7 +31,7 @@ clang-tools gnumake curl - go + unstablePkgs.go # Cross pkgsCross.aarch64-multiplatform.buildPackages.gcc # Provides aarch64-unknown-linux-gnu-gcc