Skip to content

Commit 4239636

Browse files
committed
fix(flake): remove nixpkgs-go124 and nix-fast-build dependencies
Remove nixpkgs-go124 dependency since current nixpkgs has Go 1.25.4 which is sufficient for packer. Remove nix-fast-build input as unused and add follows directives to resolve duplicate dependencies.
1 parent bb93efa commit 4239636

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

flake.nix

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@
1414
nix-editor.inputs.nixpkgs.follows = "nixpkgs";
1515
nix-editor.inputs.utils.follows = "flake-utils";
1616
nix-editor.url = "github:snowfallorg/nix-editor";
17+
nix-eval-jobs.inputs.flake-parts.follows = "flake-parts";
18+
nix-eval-jobs.inputs.treefmt-nix.follows = "treefmt-nix";
1719
nix-eval-jobs.url = "github:nix-community/nix-eval-jobs";
18-
nix-fast-build.inputs.flake-parts.follows = "flake-parts";
19-
nix-fast-build.inputs.nixpkgs.follows = "nixpkgs";
20-
nix-fast-build.inputs.treefmt-nix.follows = "treefmt-nix";
21-
nix-fast-build.url = "github:Mic92/nix-fast-build";
2220
nix2container.inputs.nixpkgs.follows = "nixpkgs";
2321
nix2container.url = "github:nlewo/nix2container";
24-
nixpkgs-go124.url = "github:Nixos/nixpkgs/d2ac4dfa61fba987a84a0a81555da57ae0b9a2b0";
22+
# Pin to a specific nixpkgs version that has compatible v8 and curl versions
23+
# for extensions that require older package versions
2524
nixpkgs-oldstable.url = "github:NixOS/nixpkgs/a76c4553d7e741e17f289224eda135423de0491d";
2625
nixpkgs.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz";
2726
rust-overlay.inputs.nixpkgs.follows = "nixpkgs";

nix/packages/packer.nix

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
{
22
pkgs,
3-
inputs,
43
lib,
54
fetchFromGitHub,
65
installShellFiles,
76
...
87
}:
98
let
10-
go124 = inputs.nixpkgs-go124.legacyPackages.${pkgs.system}.go_1_24;
11-
buildGoModule = pkgs.buildGoModule.override { go = go124; };
9+
buildGoModule = pkgs.buildGoModule;
1210
in
1311
buildGoModule rec {
1412
pname = "packer";

0 commit comments

Comments
 (0)