From 60b35b61f00bc12d784d9420d886e91ceb226317 Mon Sep 17 00:00:00 2001 From: kirinnee Date: Thu, 19 Oct 2023 20:48:55 +0800 Subject: [PATCH] fix: missing nodejs --- .github/workflows/ci.yaml | 4 +- App/App.csproj | 7 +- App/packages.lock.json | 100 +++++++++++----------------- IntTest/IntTest.csproj | 2 +- UnitTest/UnitTest.csproj | 2 +- UnitTest/packages.lock.json | 38 +++++------ flake.lock | 111 ++++++++++++++++++++++++++------ flake.nix | 10 +-- infra/api_chart/README.md | 2 +- infra/migration_chart/README.md | 2 +- infra/root_chart/README.md | 2 +- nix/packages.nix | 10 +-- 12 files changed, 165 insertions(+), 125 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a3a098b..a824aba 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -49,8 +49,8 @@ jobs: steps: - uses: actions/checkout@v4 - uses: rlespinasse/github-slug-action@v3.x - - uses: docker/setup-buildx-action@v2 - - uses: docker/setup-qemu-action@v2 + - uses: docker/setup-buildx-action@v3 + - uses: docker/setup-qemu-action@v3 - name: Build and Push Docker run: ./scripts/ci/ci-docker.sh env: diff --git a/App/App.csproj b/App/App.csproj index d98e339..87ca844 100644 --- a/App/App.csproj +++ b/App/App.csproj @@ -10,7 +10,7 @@ - + @@ -20,8 +20,7 @@ - - + all @@ -46,7 +45,7 @@ - + diff --git a/App/packages.lock.json b/App/packages.lock.json index 5fc21c6..af66339 100644 --- a/App/packages.lock.json +++ b/App/packages.lock.json @@ -4,9 +4,9 @@ "net8.0": { "Asp.Versioning.Http": { "type": "Direct", - "requested": "[7.0.0, )", - "resolved": "7.0.0", - "contentHash": "FG5grz29CYBT06xDWoM1hf+pfB7sPDYXuOOIYtVNIHduUQeWsxMfCITcDrMmZNXAf0TfcYRwCizJfOIJzWmaXA==", + "requested": "[7.1.0, )", + "resolved": "7.1.0", + "contentHash": "Q1gPDssnFLeS3Avw/JABPzis4pjrG372RpFnB/9zp61hSuSf+Y+1O9twicNHDsmeWMkb/oNQo3vHgLr16jTdNw==", "dependencies": { "Asp.Versioning.Abstractions": "7.0.0" } @@ -130,23 +130,13 @@ "resolved": "1.2.0", "contentHash": "5TidVQwiwZ5Ab6u443OUIPhEq+Qa/8Y4fbwDVxdMulkCAs1Bp8/HFL1ohn8MwUMt8Kw5k/FCPekL/r++CdM/CA==" }, - "MeiliSearch": { - "type": "Direct", - "requested": "[0.14.2, )", - "resolved": "0.14.2", - "contentHash": "96flL6QkqivdZ7Eg8bQ51EzFVyyM70+wreHiorfl8iEWPqdzR4A2JexQ6FrFAf/lZZ3EcFpV94I2UfR6w3SRvQ==", - "dependencies": { - "System.IdentityModel.Tokens.Jwt": "6.30.0", - "System.Net.Http.Json": "6.0.0" - } - }, "Microsoft.AspNetCore.Authentication.JwtBearer": { "type": "Direct", - "requested": "[8.0.0-preview.4.23260.4, )", - "resolved": "8.0.0-preview.4.23260.4", - "contentHash": "adJxhgDQY6pvvRiAqeF7pDGv4FYPPaerCVyeqwD8nMmJeay5JmgBIz+GxF8rCWXkUoClpBnXx8XGA+D00BvKKg==", + "requested": "[8.0.0-rc.2.23480.2, )", + "resolved": "8.0.0-rc.2.23480.2", + "contentHash": "dYwrAmzLMq+gb4wPZlezpltYizdL/dn3RM6xiEkNif0yCUx4omYlTNrQdchENOF9I/aryhnEnLkvFO1+Wv4UCw==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.15.1" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.0.0" } }, "Microsoft.AspNetCore.OpenApi": { @@ -361,11 +351,11 @@ }, "StackExchange.Redis": { "type": "Direct", - "requested": "[2.6.111, )", - "resolved": "2.6.111", - "contentHash": "49NlwihVG9I1YaPqYBx2e2yPqC4ecXMog8zVXMC3rjj2kufGkC3ofqvhOPBKP0c9ZQdJ3hhzduM7ckOQTE+gxg==", + "requested": "[2.6.122, )", + "resolved": "2.6.122", + "contentHash": "wp7mvGpFXaevfZ07/SDeh/6YHUJEgwJIGyjbDWKBYbPwKMJQYFz9zFEmBptqtVzqvSgft5nlewwutoaMaG0LPA==", "dependencies": { - "Pipelines.Sockets.Unofficial": "2.2.2" + "Pipelines.Sockets.Unofficial": "2.2.8" } }, "StackExchange.Redis.Extensions": { @@ -1092,54 +1082,49 @@ }, "Microsoft.IdentityModel.Abstractions": { "type": "Transitive", - "resolved": "6.30.0", - "contentHash": "vC19oUKs6bycdBqdA5fJAElrgsJ14enyQCONWd5SOmIj1GNomdfZe9sawtFBVjU9XGTUkpGTwIVMMkxcyKlN9w==" + "resolved": "7.0.0", + "contentHash": "7iSWSRR72VKeonFdfDi43Lvkca98Y0F3TmmWhRSuHbkjk/IKUSO0Qd272LQFZpi5eDNQNbUXy3o4THXhOAU6cw==" }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.30.0", - "contentHash": "lX/ARxHCjYkFi8KT48NB7QVC+nuyRyvLD0n330MrV7uU4/DfMtwa3WXhho1iNU8A6NA4YFkiz/+sIkqgZ2Q+Gw==", + "resolved": "7.0.0", + "contentHash": "N+hUPsFZs+IhlMU+qmX8NnYVB9uMxVdcWoPIhKo4oHDR/yuIFh19SVZeFby15cm8S9yedynOcfs7TU5oDCheZw==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.30.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Tokens": "7.0.0" } }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.30.0", - "contentHash": "QoMnSniPTXLLds1lCGMokaYiCaLZu31LTnWzcITWTjMZX6fHRUNNkQYHEJH+d8AxyAH52tR3DotfkJzZe2gkEA==", + "resolved": "7.0.0", + "contentHash": "6I35Kt2/PQZAyUYLo3+QgT/LubZ5/4Ojelkbyo8KKdDgjMbVocAx2B3P5V7iMCz+rsAe/RLr6ql87QKnHtI+aw==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.30.0" + "Microsoft.IdentityModel.Abstractions": "7.0.0" } }, "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "6.15.1", - "contentHash": "6nHr+4yE8vj620Vy4L0pl7kmkvWc06wBrJ+AOo/gjqzu/UD/MYgySUqRGlZYrvvNmKkUWMw4hdn78MPCb4bstA==", + "resolved": "7.0.0", + "contentHash": "gFHbOw7cRrlmmguB7mgCoSjPYYqNBkARNR5hzonzMDew/x963oXoA4PgO412ca1Mv9oczE9ryRzitaDMqsh/eQ==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.15.1", - "Microsoft.IdentityModel.Tokens": "6.15.1" + "Microsoft.IdentityModel.Logging": "7.0.0", + "Microsoft.IdentityModel.Tokens": "7.0.0" } }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "6.15.1", - "contentHash": "WwecgT/PNrytLNUWjkYtnnG2LXMAzkINSaZM+8dPPiEpOGz1bQDBWAenTSurYICxGoA1sOPriFXk+ocnQyprKw==", + "resolved": "7.0.0", + "contentHash": "MOW80zgyO5T5Zh3ShSzzkejP/sxqjeH6xgo/0fa7r6fCPPM8PwMHMUQvFhTdpi+j2UtSmPbCPQ5bhfm1xlxajA==", "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.15.1", - "System.IdentityModel.Tokens.Jwt": "6.15.1" + "Microsoft.IdentityModel.Protocols": "7.0.0", + "System.IdentityModel.Tokens.Jwt": "7.0.0" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.30.0", - "contentHash": "5sOI98r76qPYY4hOKslPCzKUVJecdlC5tUOdf6gK/81JFZHpBpkVfMWBV6XBx4l+zeEWTZIJ6cDd6Am6gi8pFg==", + "resolved": "7.0.0", + "contentHash": "dxYqmmFLsjBQZ6F6a4XDzrZ1CTxBRFVigJvWiNtXiIsT6UlYMxs9ONMaGx9XKzcxmcgEQ2ADuCqKZduz0LR9Hw==", "dependencies": { - "Microsoft.CSharp": "4.5.0", - "Microsoft.IdentityModel.Logging": "6.30.0", - "System.Security.Cryptography.Cng": "4.5.0" + "Microsoft.IdentityModel.Logging": "7.0.0" } }, "Microsoft.NETCore.Platforms": { @@ -1214,8 +1199,8 @@ }, "Pipelines.Sockets.Unofficial": { "type": "Transitive", - "resolved": "2.2.2", - "contentHash": "Bhk0FWxH1paI+18zr1g5cTL+ebeuDcBCR+rRFO+fKEhretgjs7MF2Mc1P64FGLecWp4zKCUOPzngBNrqVyY7Zg==", + "resolved": "2.2.8", + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", "dependencies": { "System.IO.Pipelines": "5.0.1" } @@ -1352,11 +1337,11 @@ }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "6.30.0", - "contentHash": "pa9cQqPoCA03v512SjikM0xNDVW9/jUaSxAEupqtngAKjp6exElng1E47iXE0ewRjk3xqHa0vJE3x19h1a29OQ==", + "resolved": "7.0.0", + "contentHash": "3OpN2iJf8lxpzVeFeeZSLtR3co6uKBs3VudS3PkkgdX5WF9fqqdhRMYf7WbkxqWQP/9RpoFbD3RimhfJe3hlQQ==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.30.0", - "Microsoft.IdentityModel.Tokens": "6.30.0" + "Microsoft.IdentityModel.JsonWebTokens": "7.0.0", + "Microsoft.IdentityModel.Tokens": "7.0.0" } }, "System.IO": { @@ -1460,14 +1445,6 @@ "resolved": "4.5.3", "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==" }, - "System.Net.Http.Json": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GbIV4y344kGOKjshAKCIDCMUTTW/hyUC42wV0Y5SXEdIbaKBIHBUxZ2MOe4/ZiV2svUAGfQ0c8LGtUExpOI8tg==", - "dependencies": { - "System.Text.Json": "6.0.0" - } - }, "System.ObjectModel": { "type": "Transitive", "resolved": "4.3.0", @@ -1612,11 +1589,6 @@ "System.Runtime.Handles": "4.3.0" } }, - "System.Security.Cryptography.Cng": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" - }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", "resolved": "8.0.0-preview.4.23259.5", diff --git a/IntTest/IntTest.csproj b/IntTest/IntTest.csproj index 27ffeef..9e9cca1 100644 --- a/IntTest/IntTest.csproj +++ b/IntTest/IntTest.csproj @@ -13,7 +13,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/UnitTest/UnitTest.csproj b/UnitTest/UnitTest.csproj index 070e5ff..264a878 100644 --- a/UnitTest/UnitTest.csproj +++ b/UnitTest/UnitTest.csproj @@ -13,7 +13,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/UnitTest/packages.lock.json b/UnitTest/packages.lock.json index d1f18d3..4cd03f6 100644 --- a/UnitTest/packages.lock.json +++ b/UnitTest/packages.lock.json @@ -38,13 +38,13 @@ }, "xunit": { "type": "Direct", - "requested": "[2.4.2, )", - "resolved": "2.4.2", - "contentHash": "6Mj73Ont3zj2CJuoykVJfE0ZmRwn7C+pTuRP8c4bnaaTFjwNG6tGe0prJ1yIbMe9AHrpDys63ctWacSsFJWK/w==", + "requested": "[2.5.3, )", + "resolved": "2.5.3", + "contentHash": "VxYDiWSwrLxOJ3UEN+ZPrBybB0SFShQ1E6PjT65VdoKCJhorgerFznThjSwawRH/WAip73YnucDVsE8WRj/8KQ==", "dependencies": { - "xunit.analyzers": "1.0.0", - "xunit.assert": "2.4.2", - "xunit.core": "[2.4.2]" + "xunit.analyzers": "1.4.0", + "xunit.assert": "2.5.3", + "xunit.core": "[2.5.3]" } }, "xunit.runner.visualstudio": { @@ -1009,30 +1009,30 @@ }, "xunit.analyzers": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "BeO8hEgs/c8Ls2647fPfieMngncvf0D0xYNDfIO59MolxtCtVjFRd6SRc+7tj8VMqkVOuJcnc9eh4ngI2cAmLQ==" + "resolved": "1.4.0", + "contentHash": "7ljnTJfFjz5zK+Jf0h2dd2QOSO6UmFizXsojv/x4QX7TU5vEgtKZPk9RvpkiuUqg2bddtNZufBoKQalsi7djfA==" }, "xunit.assert": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "pxJISOFjn2XTTi1mcDCkRZrTFb9OtRRCtx2kZFNF51GdReLr1ls2rnyxvAS4JO247K3aNtflvh5Q0346K5BROA==", + "resolved": "2.5.3", + "contentHash": "MK3HiBckO3vdxEdUxXZyyRPsBNPsC/nz6y1gj/UZIZkjMnsVQyZPU8yxS/3cjTchYcqskt/nqUOS5wmD8JezdQ==", "dependencies": { "NETStandard.Library": "1.6.1" } }, "xunit.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "KB4yGCxNqIVyekhJLXtKSEq6BaXVp/JO3mbGVE1hxypZTLEe7h+sTbAhpA+yZW2dPtXTuiW+C1B2oxxHEkrmOw==", + "resolved": "2.5.3", + "contentHash": "FE8yEEUkoMLd6kOHDXm/QYfX/dYzwc0c+Q4MQon6VGRwFuy6UVGwK/CFA5LEea+ZBEmcco7AEl2q78VjsA0j/w==", "dependencies": { - "xunit.extensibility.core": "[2.4.2]", - "xunit.extensibility.execution": "[2.4.2]" + "xunit.extensibility.core": "[2.5.3]", + "xunit.extensibility.execution": "[2.5.3]" } }, "xunit.extensibility.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "W1BoXTIN1C6kpVSMw25huSet25ky6IAQUNovu3zGOGN/jWnbgSoTyCrlIhmXSg0tH5nEf8q7h3OjNHOjyu5PfA==", + "resolved": "2.5.3", + "contentHash": "IjAQlPeZWXP89pl1EuOG9991GH1qgAL0rQfkmX2UV+PDenbYb7oBnQopL9ujE6YaXxgaQazp7lFjsDyyxD6Mtw==", "dependencies": { "NETStandard.Library": "1.6.1", "xunit.abstractions": "2.0.3" @@ -1040,11 +1040,11 @@ }, "xunit.extensibility.execution": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "CZmgcKkwpyo8FlupZdWpJCryrAOWLh1FBPG6gmVZuPQkGQsim/oL4PcP4nfrC2hHgXUFtluvaJ0Sp9PQKUMNpg==", + "resolved": "2.5.3", + "contentHash": "w9eGCHl+gJj1GzZSf0VTzYPp/gv4fiUDkr+yR7/Wv9/ucO2CHltGg2TnyySLFjzekkjuxVJZUE+tZyDNzryJFw==", "dependencies": { "NETStandard.Library": "1.6.1", - "xunit.extensibility.core": "[2.4.2]" + "xunit.extensibility.core": "[2.5.3]" } } } diff --git a/flake.lock b/flake.lock index 71ea3a9..1c60832 100644 --- a/flake.lock +++ b/flake.lock @@ -6,21 +6,23 @@ "dev-npkgs": "dev-npkgs", "dev-npkgs-unstable-05-Oct-2022": "dev-npkgs-unstable-05-Oct-2022", "dev-npkgs-unstable-11-Dec-2022": "dev-npkgs-unstable-11-Dec-2022", + "dev-npkgs-unstable-20-Sep-2023": "dev-npkgs-unstable-20-Sep-2023", + "fenix": "fenix", "flake-utils": "flake-utils_2", "npkgs": "npkgs", "npkgs-unstable": "npkgs-unstable" }, "locked": { - "lastModified": 1694505425, - "narHash": "sha256-oaujg9qOA/812dcGHShAqyOkcTq8jtS/XG4IcYMbLA8=", + "lastModified": 1697689175, + "narHash": "sha256-YPZaMN3vAfLh9o1Xkjsw8rMDb2MHNFwH8yE0fWRuggw=", "owner": "kirinnee", "repo": "test-nix-repo", - "rev": "57158ec5a3f311545f28c2b5f99e6b711ac67cd9", + "rev": "36397f2964d94a345889c1243d83708814c72e0b", "type": "github" }, "original": { "owner": "kirinnee", - "ref": "v19.0.0", + "ref": "v22.0.0", "repo": "test-nix-repo", "type": "github" } @@ -113,6 +115,40 @@ "type": "indirect" } }, + "dev-npkgs-unstable-20-Sep-2023": { + "locked": { + "lastModified": 1694959747, + "narHash": "sha256-CXQ2MuledDVlVM5dLC4pB41cFlBWxRw4tCBsFrq3cRk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "970a59bd19eff3752ce552935687100c46e820a5", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "rev": "970a59bd19eff3752ce552935687100c46e820a5", + "type": "indirect" + } + }, + "fenix": { + "inputs": { + "nixpkgs": "nixpkgs", + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1697696548, + "narHash": "sha256-653vv/6fwAaLnsm97S+BIAa7OsSlVv9FZIqTzlg4jXQ=", + "owner": "nix-community", + "repo": "fenix", + "rev": "9d8534763043e7761b6872e6210d3a68ea2f296c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -242,17 +278,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1694343207, - "narHash": "sha256-jWi7OwFxU5Owi4k2JmiL1sa/OuBCQtpaAesuj5LXC8w=", - "owner": "NixOS", + "lastModified": 1697456312, + "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "78058d810644f5ed276804ce7ea9e82d92bee293", + "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", "type": "github" }, "original": { - "id": "nixpkgs", - "rev": "78058d810644f5ed276804ce7ea9e82d92bee293", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-2305": { @@ -270,18 +307,18 @@ "type": "indirect" } }, - "nixpkgs-sep-12-23": { + "nixpkgs-oct-19-23": { "locked": { - "lastModified": 1694343207, - "narHash": "sha256-jWi7OwFxU5Owi4k2JmiL1sa/OuBCQtpaAesuj5LXC8w=", + "lastModified": 1697379843, + "narHash": "sha256-RcnGuJgC2K/UpTy+d32piEoBXq2M+nVFzM3ah/ZdJzg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "78058d810644f5ed276804ce7ea9e82d92bee293", + "rev": "12bdeb01ff9e2d3917e6a44037ed7df6e6c3df9d", "type": "github" }, "original": { "id": "nixpkgs", - "rev": "78058d810644f5ed276804ce7ea9e82d92bee293", + "rev": "12bdeb01ff9e2d3917e6a44037ed7df6e6c3df9d", "type": "indirect" } }, @@ -302,6 +339,21 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1694343207, + "narHash": "sha256-jWi7OwFxU5Owi4k2JmiL1sa/OuBCQtpaAesuj5LXC8w=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "78058d810644f5ed276804ce7ea9e82d92bee293", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "rev": "78058d810644f5ed276804ce7ea9e82d92bee293", + "type": "indirect" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1689261696, "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=", @@ -317,7 +369,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1691654369, "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", @@ -430,7 +482,7 @@ "flake-compat": "flake-compat", "flake-utils": "flake-utils_5", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -452,13 +504,30 @@ "atomipkgs": "atomipkgs", "atomipkgs_classic": "atomipkgs_classic", "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-2305": "nixpkgs-2305", - "nixpkgs-sep-12-23": "nixpkgs-sep-12-23", + "nixpkgs-oct-19-23": "nixpkgs-oct-19-23", "pre-commit-hooks": "pre-commit-hooks", "treefmt-nix": "treefmt-nix" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1697631181, + "narHash": "sha256-W1EWCDHVZTAv1Xp4xirCqaYlHZLIWShVVBk2YQIRcXE=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "4586a6b26cd5a975a1826c0cfd9004a9bce3d7fd", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -536,7 +605,7 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1693817438, diff --git a/flake.nix b/flake.nix index 8385ecb..008a59d 100644 --- a/flake.nix +++ b/flake.nix @@ -8,8 +8,8 @@ # registry nixpkgs.url = "nixpkgs/78058d810644f5ed276804ce7ea9e82d92bee293"; nixpkgs-2305.url = "nixpkgs/nixos-23.05"; - nixpkgs-sep-12-23.url = "nixpkgs/78058d810644f5ed276804ce7ea9e82d92bee293"; - atomipkgs.url = "github:kirinnee/test-nix-repo/v19.0.0"; + nixpkgs-oct-19-23.url = "nixpkgs/12bdeb01ff9e2d3917e6a44037ed7df6e6c3df9d"; + atomipkgs.url = "github:kirinnee/test-nix-repo/v22.0.0"; atomipkgs_classic.url = "github:kirinnee/test-nix-repo/classic"; }; @@ -26,7 +26,7 @@ , atomipkgs_classic , nixpkgs , nixpkgs-2305 - , nixpkgs-sep-12-23 + , nixpkgs-oct-19-23 } @inputs: (flake-utils.lib.eachDefaultSystem @@ -35,7 +35,7 @@ let pkgs = nixpkgs.legacyPackages.${system}; pkgs-2305 = nixpkgs-2305.legacyPackages.${system}; - pkgs-sep-12-23 = nixpkgs-sep-12-23.legacyPackages.${system}; + pkgs-oct-19-23 = nixpkgs-oct-19-23.legacyPackages.${system}; atomi = atomipkgs.packages.${system}; atomi_classic = atomipkgs_classic.packages.${system}; pre-commit-lib = pre-commit-hooks.lib.${system}; @@ -49,7 +49,7 @@ }; packages = import ./nix/packages.nix { - inherit pkgs pkgs-2305 atomi atomi_classic pkgs-sep-12-23; + inherit pkgs pkgs-2305 atomi atomi_classic pkgs-oct-19-23; }; env = import ./nix/env.nix { inherit pkgs packages; diff --git a/infra/api_chart/README.md b/infra/api_chart/README.md index ffa5bbb..dc1db02 100644 --- a/infra/api_chart/README.md +++ b/infra/api_chart/README.md @@ -48,4 +48,4 @@ A Chart to deploy .NET Microservice | topologySpreadConstraints | object | `{}` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.1](https://github.com/norwoodj/helm-docs/releases/v1.11.1) \ No newline at end of file +Autogenerated from chart metadata using [helm-docs v1.11.2](https://github.com/norwoodj/helm-docs/releases/v1.11.2) diff --git a/infra/migration_chart/README.md b/infra/migration_chart/README.md index 34b4d86..c25200c 100644 --- a/infra/migration_chart/README.md +++ b/infra/migration_chart/README.md @@ -35,4 +35,4 @@ A Chart to migrate .NET Microservice | topologySpreadConstraints | object | `{}` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.1](https://github.com/norwoodj/helm-docs/releases/v1.11.1) \ No newline at end of file +Autogenerated from chart metadata using [helm-docs v1.11.2](https://github.com/norwoodj/helm-docs/releases/v1.11.2) diff --git a/infra/root_chart/README.md b/infra/root_chart/README.md index 7608cf3..47970c3 100644 --- a/infra/root_chart/README.md +++ b/infra/root_chart/README.md @@ -104,4 +104,4 @@ Root Chart to a single Service | serviceTree.service | string | `"zinc"` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.1](https://github.com/norwoodj/helm-docs/releases/v1.11.1) \ No newline at end of file +Autogenerated from chart metadata using [helm-docs v1.11.2](https://github.com/norwoodj/helm-docs/releases/v1.11.2) diff --git a/nix/packages.nix b/nix/packages.nix index 896dac0..b6648ac 100644 --- a/nix/packages.nix +++ b/nix/packages.nix @@ -1,4 +1,4 @@ -{ pkgs, pkgs-2305, atomi, atomi_classic, pkgs-sep-12-23 }: +{ pkgs, pkgs-2305, atomi, atomi_classic, pkgs-oct-19-23 }: let all = { @@ -25,10 +25,10 @@ let hadolint; } ); - sep-12-23 = ( - with pkgs-sep-12-23; + oct-19-23 = ( + with pkgs-oct-19-23; { - + nodejs = nodejs_20; helm = kubernetes-helm; npm = nodePackages.npm; inherit @@ -65,4 +65,4 @@ with all; nix-2305 // atomipkgs // atomipkgs_classic // -sep-12-23 +oct-19-23