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

various fixups for newer nixpkgs

Browse source
This commit is contained in:
Luke Granger-Brown 2023-04-01 21:05:20 +00:00
parent eaf6957cd3
commit 1ba82d1f36
5 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nix/pkgs/authentik/pythonapp/default.nix
View file

@ -57,7 +57,6 @@ let
nativeBuildInputs = old.nativeBuildInputs ++ [ self.flit-core ]; nativeBuildInputs = old.nativeBuildInputs ++ [ self.flit-core ];
}); });
watchfiles = self.callPackage ../../../../third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix { CoreServices = null; }; watchfiles = self.callPackage ../../../../third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix { CoreServices = null; };
selenium = null;
cryptography = super.cryptography.overridePythonAttrs (old: { cryptography = super.cryptography.overridePythonAttrs (old: {
cargoDeps = old.cargoDeps.overrideAttrs ({ outputHash, ... }: { cargoDeps = old.cargoDeps.overrideAttrs ({ outputHash, ... }: {

11
third_party/nixpkgs/patches/poetry2nix-cryptography39.0.1.patch vendored Normal file
View file

@ -0,0 +1,11 @@
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
@@ -383,6 +383,7 @@ lib.composeManyExtensions [
"38.0.3" = "sha256-lzHLW1N4hZj+nn08NZiPVM/X+SEcIsuZDjEOy0OOkSc=";
"38.0.4" = "sha256-BN0kOblUwgHj5QBf52RY2Jx0nBn03lwoN1O5PEohbwY=";
"39.0.0" = "sha256-clorC0NtGukpE3DnZ84MSdGhJN+qC89DZPITZFuL01Q=";
+ "39.0.1" = "sha256-AlorC0NtGukpE3DnZ84MSdGhJN+qC89DZPITZFuL01Q=";
"39.0.2" = "sha256-Admz48/GS2t8diz611Ciin1HKQEyMDEwHxTpJ5tZ1ZA=";
}.${version} or (
lib.warn "Unknown cryptography version: '${version}'. Please update getCargoHash." lib.fakeHash

1
third_party/nixpkgs/patches/series vendored
View file

@ -1,2 +1,3 @@
kubo-multiaddr.patch kubo-multiaddr.patch
buildrustcrate-aarch64-linux.patch buildrustcrate-aarch64-linux.patch
poetry2nix-cryptography39.0.1.patch

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

@ -383,6 +383,7 @@ lib.composeManyExtensions [
"38.0.3" = "sha256-lzHLW1N4hZj+nn08NZiPVM/X+SEcIsuZDjEOy0OOkSc="; "38.0.3" = "sha256-lzHLW1N4hZj+nn08NZiPVM/X+SEcIsuZDjEOy0OOkSc=";
"38.0.4" = "sha256-BN0kOblUwgHj5QBf52RY2Jx0nBn03lwoN1O5PEohbwY="; "38.0.4" = "sha256-BN0kOblUwgHj5QBf52RY2Jx0nBn03lwoN1O5PEohbwY=";
"39.0.0" = "sha256-clorC0NtGukpE3DnZ84MSdGhJN+qC89DZPITZFuL01Q="; "39.0.0" = "sha256-clorC0NtGukpE3DnZ84MSdGhJN+qC89DZPITZFuL01Q=";
"39.0.1" = "sha256-AlorC0NtGukpE3DnZ84MSdGhJN+qC89DZPITZFuL01Q=";
"39.0.2" = "sha256-Admz48/GS2t8diz611Ciin1HKQEyMDEwHxTpJ5tZ1ZA="; "39.0.2" = "sha256-Admz48/GS2t8diz611Ciin1HKQEyMDEwHxTpJ5tZ1ZA=";
}.${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

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

@ -23,7 +23,8 @@ let
replaceStrings replaceStrings
toString; toString;
inherit (pkgs) lib go runCommand runCommandCC fetchFromGitHub protobuf symlinkJoin; inherit (pkgs) lib runCommand runCommandCC fetchFromGitHub protobuf symlinkJoin;
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 " ";