Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into bump_sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
mmsqe committed Jan 9, 2025
2 parents d23a15c + 62042e2 commit 94710d6
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 8 deletions.
10 changes: 6 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,11 @@
}
)
) // {
overlay = final: super: {
go = super.go_1_23;
test-env = final.callPackage ./nix/testenv.nix { };
};
overlays.default = [
(import ./nix/build_overlay.nix)
(final: super: {
test-env = final.callPackage ./nix/testenv.nix { };
})
];
};
}
10 changes: 10 additions & 0 deletions nix/build_overlay.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# some basic overlays necessary for the build
final: super: {
go_1_23 = super.go_1_23.overrideAttrs (old: rec {
version = "1.23.4";
src = final.fetchurl {
url = "https://go.dev/dl/go${version}.src.tar.gz";
hash = "sha256-rTRaxCHpCBQpOpaZzKGd1SOCUcP2h5gLvK4oSVsmNTE=";
};
});
}
1 change: 1 addition & 0 deletions nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import sources.nixpkgs {
overlays = [
(import ./build_overlay.nix)
(_: pkgs: {
flake-compat = import sources.flake-compat;
go = pkgs.go_1_23;
Expand Down
8 changes: 4 additions & 4 deletions nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@
"branch": "master",
"description": "Convert poetry projects to nix automagically [maintainer=@adisbladis] ",
"homepage": "",
"owner": "mmsqe",
"owner": "nix-community",
"repo": "poetry2nix",
"rev": "7b3eed7d8355fb0404da03964cb6c680912a9e4f",
"sha256": "03c0r1riw8zmc7m485vdsn91r8bgvhh41l7ci72zgpwlpk7dq546",
"rev": "29b2641c1c6e67d836f9a9fda8a6de85be9644ac",
"sha256": "164qi61dxw3y345bkdpiwxrk7cql7pf6kay2xi9y751ypssrji4m",
"type": "tarball",
"url": "https://github.com/mmsqe/poetry2nix/archive/7b3eed7d8355fb0404da03964cb6c680912a9e4f.tar.gz",
"url": "https://github.com/nix-community/poetry2nix/archive/29b2641c1c6e67d836f9a9fda8a6de85be9644ac.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"flake-compat": {
Expand Down

0 comments on commit 94710d6

Please sign in to comment.