chore(ci): Remove CI concurrency group & small fixes (#1758)
## Description <!-- Please insert your description here and especially provide info about the "what" this PR is solving --> It has no effect. The actions are run in parallel anyway. They have been previously updated to not fail when run in parallel. ## Linked Issues <!-- Optional, if you have any --> ## Additional Context <!-- e.g. is there anything you'd like reviewers to focus on? -->
This commit is contained in:
@@ -12,9 +12,6 @@ on:
|
|||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: nix-update
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
update:
|
update:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|||||||
@@ -11,9 +11,6 @@ on:
|
|||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: nix-update
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
update:
|
update:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|||||||
Generated
+3
-3
@@ -2,11 +2,11 @@
|
|||||||
"nodes": {
|
"nodes": {
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764517877,
|
"lastModified": 1777268161,
|
||||||
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
|
"narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
|
"rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -44,7 +44,7 @@
|
|||||||
inputsFrom = [ self.packages.${system}.airi ];
|
inputsFrom = [ self.packages.${system}.airi ];
|
||||||
packages = [
|
packages = [
|
||||||
nixd
|
nixd
|
||||||
nixfmt-rfc-style
|
nixfmt
|
||||||
nixfmt-tree
|
nixfmt-tree
|
||||||
pnpm
|
pnpm
|
||||||
python314
|
python314
|
||||||
|
|||||||
+7
-4
@@ -1,8 +1,10 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
stdenvNoCC,
|
stdenvNoCC,
|
||||||
|
fetchPnpmDeps,
|
||||||
|
|
||||||
pnpm,
|
pnpm_10,
|
||||||
|
pnpmConfigHook,
|
||||||
|
|
||||||
cacert,
|
cacert,
|
||||||
gitMinimal,
|
gitMinimal,
|
||||||
@@ -24,9 +26,9 @@ stdenvNoCC.mkDerivation (final: {
|
|||||||
!isEditorMetadataDirectory;
|
!isEditorMetadataDirectory;
|
||||||
};
|
};
|
||||||
|
|
||||||
pnpmDeps = pnpm.fetchDeps {
|
pnpmDeps = fetchPnpmDeps {
|
||||||
inherit (final) pname version src;
|
inherit (final) pname version src;
|
||||||
fetcherVersion = 2;
|
fetcherVersion = 3;
|
||||||
hash = builtins.readFile ./pnpm-deps-hash.txt;
|
hash = builtins.readFile ./pnpm-deps-hash.txt;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -39,7 +41,8 @@ stdenvNoCC.mkDerivation (final: {
|
|||||||
cacert # For network request
|
cacert # For network request
|
||||||
gitMinimal # For unplugin-info
|
gitMinimal # For unplugin-info
|
||||||
nodejs
|
nodejs
|
||||||
pnpm.configHook
|
pnpm_10
|
||||||
|
pnpmConfigHook
|
||||||
];
|
];
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
|
|||||||
+4
-2
@@ -6,7 +6,8 @@
|
|||||||
makeDesktopItem,
|
makeDesktopItem,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
gitMinimal,
|
gitMinimal,
|
||||||
pnpm,
|
pnpm_10,
|
||||||
|
pnpmConfigHook,
|
||||||
|
|
||||||
asar,
|
asar,
|
||||||
electron,
|
electron,
|
||||||
@@ -20,7 +21,8 @@
|
|||||||
makeWrapper
|
makeWrapper
|
||||||
gitMinimal
|
gitMinimal
|
||||||
nodejs
|
nodejs
|
||||||
pnpm.configHook
|
pnpm_10
|
||||||
|
pnpmConfigHook
|
||||||
];
|
];
|
||||||
|
|
||||||
desktopItems = [
|
desktopItems = [
|
||||||
|
|||||||
Generated
+3
-1
@@ -17451,6 +17451,7 @@ packages:
|
|||||||
|
|
||||||
uuid@10.0.0:
|
uuid@10.0.0:
|
||||||
resolution: {integrity: sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==}
|
resolution: {integrity: sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==}
|
||||||
|
deprecated: uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
uuid@13.0.0:
|
uuid@13.0.0:
|
||||||
@@ -17459,11 +17460,12 @@ packages:
|
|||||||
|
|
||||||
uuid@3.4.0:
|
uuid@3.4.0:
|
||||||
resolution: {integrity: sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==}
|
resolution: {integrity: sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==}
|
||||||
deprecated: Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.
|
deprecated: uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
uuid@8.3.2:
|
uuid@8.3.2:
|
||||||
resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
|
resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
|
||||||
|
deprecated: uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
valibot@1.2.0:
|
valibot@1.2.0:
|
||||||
|
|||||||
Reference in New Issue
Block a user