diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-05-13 18:01:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-13 18:01:14 +0000 |
| commit | 021f9a2fe5684091c30dfe181d03d9a2080db4b7 (patch) | |
| tree | cd1ac5c8958e55835ce744c347573d06c5f02b7c /pkgs/top-level | |
| parent | 1ba92fc952861092e46d708634eab59cf728e399 (diff) | |
| parent | b4286ceedd42e457222047c3fbb18ff23707d23b (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe8f1af63dada..7e41d9e3315ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26091,7 +26091,11 @@ with pkgs; tailspin = callPackage ../tools/misc/tailspin { }; - thanos = callPackage ../servers/monitoring/thanos { }; + thanos = callPackage ../servers/monitoring/thanos { + # Fails to run with go1.20 due to go4.org/unsafe/assume-no-moving-gc not being + # update to be compatible with Go 1.20 + buildGoModule = buildGo119Module; + }; trafficserver = callPackage ../servers/http/trafficserver { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ace7eaf4044e8..09bbff4034bef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3521,6 +3521,8 @@ self: super: with self; { findimports = callPackage ../development/python-modules/findimports { }; + find-libpython = callPackage ../development/python-modules/find-libpython { }; + findpython = callPackage ../development/python-modules/findpython { }; fingerprints = callPackage ../development/python-modules/fingerprints { }; |