diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-23 18:01:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-23 18:01:20 +0000 |
| commit | 79027ec35d8db60f1768a522e1ed77c3114c41e5 (patch) | |
| tree | fb78cf2fb5f15f3b72daf18c2839d8d12f281171 /pkgs/servers | |
| parent | 38d802ea1da8fc829b6709b3fe263836f0508f67 (diff) | |
| parent | 58f080bc6eec8cb6b06d2cc42f6a97ea66067830 (diff) | |
| download | nixlib-79027ec35d8db60f1768a522e1ed77c3114c41e5.tar nixlib-79027ec35d8db60f1768a522e1ed77c3114c41e5.tar.gz nixlib-79027ec35d8db60f1768a522e1ed77c3114c41e5.tar.bz2 nixlib-79027ec35d8db60f1768a522e1ed77c3114c41e5.tar.lz nixlib-79027ec35d8db60f1768a522e1ed77c3114c41e5.tar.xz nixlib-79027ec35d8db60f1768a522e1ed77c3114c41e5.tar.zst nixlib-79027ec35d8db60f1768a522e1ed77c3114c41e5.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/alice-lg/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/servers/geospatial/fit-trackee/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/servers/mastodon/default.nix | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/pkgs/servers/alice-lg/default.nix b/pkgs/servers/alice-lg/default.nix index d60404016ca9..c81ca8f5c121 100644 --- a/pkgs/servers/alice-lg/default.nix +++ b/pkgs/servers/alice-lg/default.nix @@ -5,6 +5,7 @@ , stdenv , yarn , nodejs +, nixosTests , git , prefetch-yarn-deps }: @@ -74,6 +75,8 @@ buildGoModule rec { subPackages = [ "cmd/alice-lg" ]; doCheck = false; + passthru.tests = nixosTests.alice-lg; + meta = with lib; { homepage = "https://github.com/alice-lg/alice-lg"; description = "A looking-glass for BGP sessions"; diff --git a/pkgs/servers/geospatial/fit-trackee/default.nix b/pkgs/servers/geospatial/fit-trackee/default.nix index c7bc7fbc2e5b..266747622db9 100644 --- a/pkgs/servers/geospatial/fit-trackee/default.nix +++ b/pkgs/servers/geospatial/fit-trackee/default.nix @@ -21,6 +21,15 @@ let "test/ext/mypy" ]; }); + flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "3.0.5"; + + src = fetchPypi { + pname = "flask_sqlalchemy"; + inherit version; + hash = "sha256-xXZeWMoUVAG1IQbA9GF4VpJDxdolVWviwjHsxghnxbE="; + }; + }); }; }; diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index 0fa099881d96..ac4083fd9be7 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, nodejs-slim, bundlerEnv, nixosTests , yarn, callPackage, imagemagick, ffmpeg, file, ruby, writeShellScript -, fetchYarnDeps, fixup_yarn_lock +, fetchYarnDeps, prefetch-yarn-deps , brotli # Allow building a fork or custom version of Mastodon: @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { hash = yarnHash; }; - nativeBuildInputs = [ fixup_yarn_lock nodejs-slim yarn mastodonGems mastodonGems.wrappedRuby brotli ]; + nativeBuildInputs = [ prefetch-yarn-deps nodejs-slim yarn mastodonGems mastodonGems.wrappedRuby brotli ]; RAILS_ENV = "production"; NODE_ENV = "production"; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { # This option is needed for openssl-3 compatibility # Otherwise we encounter this upstream issue: https://github.com/mastodon/mastodon/issues/17924 export NODE_OPTIONS=--openssl-legacy-provider - fixup_yarn_lock ~/yarn.lock + fixup-yarn-lock ~/yarn.lock yarn config --offline set yarn-offline-mirror $yarnOfflineCache yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress |