Skip to content

Commit

Permalink
Problem: golang patch is released in nixpkgs
Browse files Browse the repository at this point in the history
Solution:
- update deps
  • Loading branch information
yihuang committed Feb 24, 2025
1 parent 83a6b18 commit 62cf4dd
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 61 deletions.
31 changes: 16 additions & 15 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
flake-utils.url = "github:numtide/flake-utils";
nix-bundle-exe = {
url = "github:3noch/nix-bundle-exe";
Expand Down
20 changes: 1 addition & 19 deletions nix/build_overlay.nix
Original file line number Diff line number Diff line change
@@ -1,23 +1,5 @@
# some basic overlays necessary for the build
final: super:
let
replaceLast =
newVal: l:
let
len = builtins.length l;
in
if len == 0 then [ ] else final.lib.lists.take (len - 1) l ++ [ newVal ];
in
{
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=";
};
# https://github.com/NixOS/nixpkgs/pull/372367
patches = replaceLast ./go_no_vendor_checks-1.23.patch old.patches;
});
final: super: {
rocksdb = final.callPackage ./rocksdb.nix { };
golangci-lint = final.callPackage ./golangci-lint.nix { };
}
26 changes: 0 additions & 26 deletions nix/go_no_vendor_checks-1.23.patch

This file was deleted.

0 comments on commit 62cf4dd

Please sign in to comment.