From 1ba82d1f36e87b7640776e91ec740ef2942f5b0f Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 1 Apr 2023 21:05:20 +0000 Subject: [PATCH] various fixups for newer nixpkgs --- nix/pkgs/authentik/pythonapp/default.nix | 1 - .../patches/poetry2nix-cryptography39.0.1.patch | 11 +++++++++++ third_party/nixpkgs/patches/series | 1 + .../tools/poetry2nix/poetry2nix/overrides/default.nix | 1 + third_party/tvl/nix/buildGo/default.nix | 3 ++- 5 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 third_party/nixpkgs/patches/poetry2nix-cryptography39.0.1.patch diff --git a/nix/pkgs/authentik/pythonapp/default.nix b/nix/pkgs/authentik/pythonapp/default.nix index a72c9b329c..3a5f29665a 100644 --- a/nix/pkgs/authentik/pythonapp/default.nix +++ b/nix/pkgs/authentik/pythonapp/default.nix @@ -57,7 +57,6 @@ let nativeBuildInputs = old.nativeBuildInputs ++ [ self.flit-core ]; }); watchfiles = self.callPackage ../../../../third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix { CoreServices = null; }; - selenium = null; cryptography = super.cryptography.overridePythonAttrs (old: { cargoDeps = old.cargoDeps.overrideAttrs ({ outputHash, ... }: { diff --git a/third_party/nixpkgs/patches/poetry2nix-cryptography39.0.1.patch b/third_party/nixpkgs/patches/poetry2nix-cryptography39.0.1.patch new file mode 100644 index 0000000000..2d5e1ce34a --- /dev/null +++ b/third_party/nixpkgs/patches/poetry2nix-cryptography39.0.1.patch @@ -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 diff --git a/third_party/nixpkgs/patches/series b/third_party/nixpkgs/patches/series index 2f2fbd7867..467c9ee10b 100644 --- a/third_party/nixpkgs/patches/series +++ b/third_party/nixpkgs/patches/series @@ -1,2 +1,3 @@ kubo-multiaddr.patch buildrustcrate-aarch64-linux.patch +poetry2nix-cryptography39.0.1.patch diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix index ce3b8a554b..4d11f06aa2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +++ b/third_party/nixpkgs/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 diff --git a/third_party/tvl/nix/buildGo/default.nix b/third_party/tvl/nix/buildGo/default.nix index dbe42d255a..b96ba86574 100644 --- a/third_party/tvl/nix/buildGo/default.nix +++ b/third_party/tvl/nix/buildGo/default.nix @@ -23,7 +23,8 @@ let replaceStrings 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 spaceOut = lib.concatStringsSep " ";