|
1 | 1 | { |
2 | 2 | inputs = { |
3 | | - nixpkgs.url = "github:NixOS/nixpkgs/release-24.11"; |
| 3 | + nixpkgs.url = "github:NixOS/nixpkgs/release-25.11"; |
4 | 4 | flake-utils.url = "github:numtide/flake-utils"; |
5 | 5 | nix-bundle-exe = { |
6 | 6 | url = "github:3noch/nix-bundle-exe"; |
|
29 | 29 | }: |
30 | 30 | let |
31 | 31 | rev = self.shortRev or "dirty"; |
| 32 | + gomodOverlay = |
| 33 | + final: prev: |
| 34 | + let |
| 35 | + gomodSrc = gomod2nix.outPath; |
| 36 | + callPackage = final.callPackage; |
| 37 | + in |
| 38 | + { |
| 39 | + inherit (callPackage "${gomodSrc}/builder" { }) buildGoApplication mkGoEnv mkVendorEnv; |
| 40 | + gomod2nix = |
| 41 | + (callPackage "${gomodSrc}/default.nix" { }).overrideAttrs (_: { |
| 42 | + modRoot = "."; |
| 43 | + }); |
| 44 | + }; |
32 | 45 | mkApp = drv: { |
33 | 46 | type = "app"; |
34 | 47 | program = "${drv}/bin/${drv.meta.mainProgram}"; |
|
77 | 90 | } |
78 | 91 | )) |
79 | 92 | // { |
80 | | - overlays.default = [ |
81 | | - (import ./nix/build_overlay.nix) |
82 | | - poetry2nix.overlays.default |
83 | | - gomod2nix.overlays.default |
84 | | - (import ./testground/benchmark/overlay.nix) |
85 | | - (final: super: { |
86 | | - go = super.go_1_23; |
87 | | - test-env = final.callPackage ./nix/testenv.nix { }; |
88 | | - cronos-matrix = final.callPackage ./nix/cronos-matrix.nix { |
89 | | - inherit rev; |
90 | | - bundle-exe = final.pkgsBuildBuild.callPackage nix-bundle-exe { }; |
91 | | - }; |
92 | | - testground-image = final.callPackage ./nix/testground-image.nix { }; |
93 | | - }) |
94 | | - ]; |
| 93 | + overlays.default = |
| 94 | + [ |
| 95 | + (import ./nix/build_overlay.nix) |
| 96 | + poetry2nix.overlays.default |
| 97 | + gomodOverlay |
| 98 | + (import ./testground/benchmark/overlay.nix) |
| 99 | + (final: super: { |
| 100 | + go = super.go_1_25; |
| 101 | + test-env = final.callPackage ./nix/testenv.nix { }; |
| 102 | + cronos-matrix = final.callPackage ./nix/cronos-matrix.nix { |
| 103 | + inherit rev; |
| 104 | + bundle-exe = final.pkgsBuildBuild.callPackage nix-bundle-exe { }; |
| 105 | + }; |
| 106 | + testground-image = final.callPackage ./nix/testground-image.nix { }; |
| 107 | + }) |
| 108 | + ]; |
95 | 109 | }; |
96 | 110 | } |
0 commit comments