lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

3p: drop socket patches to go, remove incompatible dir, etc.

Browse source
This commit is contained in:
Luke Granger-Brown 2023-10-12 20:13:32 +00:00
parent 281b8f9f35
commit 9f4471d040
4 changed files with 13 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
third_party/default.nix vendored
View file

@ -9,6 +9,12 @@ let
checkMeta = false; checkMeta = false;
permittedInsecurePackages = [ permittedInsecurePackages = [
"nodejs-16.20.2" # for openvscode-server "nodejs-16.20.2" # for openvscode-server
# for authentik?
"python3.10-requests-2.29.0"
"python3.10-cryptography-40.0.2"
"python3.11-requests-2.29.0"
"python3.11-cryptography-40.0.2"
]; ];
packageOverrides = pkgs: { packageOverrides = pkgs: {
factorio = pkgs.factorio.override depot.ops.secrets.factorio; factorio = pkgs.factorio.override depot.ops.secrets.factorio;
@ -31,27 +37,6 @@ let
nixpkgs = import ./nixpkgs { nixpkgs = import ./nixpkgs {
inherit system; inherit system;
config = nixpkgsConfig; config = nixpkgsConfig;
overlays = [(final: prev: {
go_1_20_socket = prev.go_1_20.overrideAttrs (old: {
patches = old.patches ++ [(final.fetchpatch {
url = "https://go.googlesource.com/go/+/ad087ee2804b7ce088161df04403c93ddc623888%5E%21?format=TEXT";
sha256 = "14z1rgn2qhmzhk9b8iksdknzrf0fbbhabqngcz5jlskc8vwdd14v";
decode = "base64 -d";
})];
});
vault = prev.vault.override {
buildGoModule = prev.buildGoModule.override {
go = final.go_1_20_socket;
};
};
go_1_19_socket = prev.go_1_19.overrideAttrs (old: {
patches = old.patches ++ [(final.fetchpatch {
url = "https://go.googlesource.com/go/+/ad087ee2804b7ce088161df04403c93ddc623888%5E%21?format=TEXT";
sha256 = "14z1rgn2qhmzhk9b8iksdknzrf0fbbhabqngcz5jlskc8vwdd14v";
decode = "base64 -d";
})];
});
})];
}; };
crate2nixSrc = nixpkgs.fetchFromGitHub { crate2nixSrc = nixpkgs.fetchFromGitHub {
owner = "kolloch"; owner = "kolloch";

3
third_party/nixpkgs/copy.bara.sky vendored
View file

@ -9,6 +9,9 @@ core.workflow(
fetch = "default", fetch = "default",
push = "default", push = "default",
), ),
origin_files = glob(["**"], exclude = [
"pkgs/test/nixpkgs-check-by-name/**",
]),
destination_files = glob(["third_party/nixpkgs/**"], exclude = [ destination_files = glob(["third_party/nixpkgs/**"], exclude = [
"third_party/nixpkgs/copy.bara.sky", "third_party/nixpkgs/copy.bara.sky",
"third_party/nixpkgs/patches/**", "third_party/nixpkgs/patches/**",

3
third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix vendored
View file

@ -386,6 +386,8 @@ lib.composeManyExtensions [
"40.0.1" = "sha256-gFfDTc2QWBWHBCycVH1dYlCsWQMVcRZfOBIau+njtDU="; "40.0.1" = "sha256-gFfDTc2QWBWHBCycVH1dYlCsWQMVcRZfOBIau+njtDU=";
"40.0.2" = "sha256-cV4GTfbVYanElXOVmynvrru2wJuWvnT1Z1tQKXdkbg0="; "40.0.2" = "sha256-cV4GTfbVYanElXOVmynvrru2wJuWvnT1Z1tQKXdkbg0=";
"41.0.1" = "sha256-38q81vRf8QHR8lFRM2KbH7Ng5nY7nmtWRMoPWS9VO/U="; "41.0.1" = "sha256-38q81vRf8QHR8lFRM2KbH7Ng5nY7nmtWRMoPWS9VO/U=";
"41.0.2" = "sha256-hkuoICa/suMXlr4u95JbMlFzi27lJqJRmWnX3nZfzKU=";
"41.0.3" = "sha256-LQu7waympGUs+CZun2yDQd2gUUAgyisKBG5mddrfSo0=";
}.${version} or ( }.${version} or (
lib.warn "Unknown cryptography version: '${version}'. Please update getCargoHash." lib.fakeHash lib.warn "Unknown cryptography version: '${version}'. Please update getCargoHash." lib.fakeHash
); );
@ -2674,6 +2676,7 @@ lib.composeManyExtensions [
let let
# Watchfiles does not include Cargo.lock in tarball released on PyPi for versions up to 0.17.0 # Watchfiles does not include Cargo.lock in tarball released on PyPi for versions up to 0.17.0
getRepoHash = version: { getRepoHash = version: {
"0.20.0" = "sha256-eoKF6uBHgML63DrDlC1zPfDu/mAMoaevttwqHLCKh+M=";
"0.19.0" = "sha256-NmmeoaIfFMNKCcjH6tPnkpflkN35bKlT76MqF9W8LBc="; "0.19.0" = "sha256-NmmeoaIfFMNKCcjH6tPnkpflkN35bKlT76MqF9W8LBc=";
"0.18.1" = "sha256-XEhu6M1hFi3/gAKZcei7KJSrIhhlZhlvZvbfyA6VLR4="; "0.18.1" = "sha256-XEhu6M1hFi3/gAKZcei7KJSrIhhlZhlvZvbfyA6VLR4=";
"0.18.0" = "sha256-biGGn0YAUbSO1hCJ4kU0ZWlqlXl/HRrBS3iIA3myRI8="; "0.18.0" = "sha256-biGGn0YAUbSO1hCJ4kU0ZWlqlXl/HRrBS3iIA3myRI8=";

2
third_party/tvl/nix/buildGo/default.nix vendored
View file

@ -24,7 +24,7 @@ let
toString; toString;
inherit (pkgs) lib runCommand runCommandCC fetchFromGitHub protobuf symlinkJoin; inherit (pkgs) lib runCommand runCommandCC fetchFromGitHub protobuf symlinkJoin;
go = pkgs.go_1_19_socket; go = pkgs.go_1_19;
# Helpers for low-level Go compiler invocations # Helpers for low-level Go compiler invocations
spaceOut = lib.concatStringsSep " "; spaceOut = lib.concatStringsSep " ";