qbit/xin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

overlays,h: move go overlay to just h

Browse Source
This commit is contained in:
Aaron Bieber 2023-01-03 08:24:11 -07:00
parent b6e12bffbe
commit d65ed70c26
No known key found for this signature in database
3 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hosts/h/default.nix
View File

@ -45,6 +45,10 @@ in {
scripts = with super.weechatScripts; [ highmon weepushover ];
};
};
go = super.go_1_19.overrideAttrs
(old: { patches = old.patches ++ [ ../../overlays/452438.diff ]; });
go_1_19 = super.go_1_19.overrideAttrs
(old: { patches = old.patches ++ [ ../../overlays/452438.diff ]; });
})
];

19
overlays/default.nix
View File

@ -1,19 +1,4 @@
{ self, config, pkgs, lib, isUnstable, ... }:
let go = self: super: {
go = super.go_1_19.overrideAttrs (old: {
patches = old.patches ++ [
./452438.diff
];
});
};
go1_19 = self: super: {
go_1_19 = super.go_1_19.overrideAttrs (old: {
patches = old.patches ++ [
./452438.diff
];
});
};
in {
{ self, config, pkgs, lib, isUnstable, ... }: {
nixpkgs.overlays = if isUnstable then
[
(self: super: {
@ -30,8 +15,6 @@ in {
]
else
[
go
go1_19
(self: super: {
matrix-synapse = super.matrix-synapse.overrideAttrs (old: rec {
version = "1.74.0";

2
pkgs/gotosocial.nix
View File

@ -38,7 +38,7 @@ buildGo119Module rec {
preBuild = ''
echo ${go}/bin/go
${go}/bin/go version
'';
'';
postInstall = ''
mkdir -p $out/assets