From f8a27ee179fc9ff377e93ec8767d19275e6e1398 Mon Sep 17 00:00:00 2001 From: kirinnee Date: Thu, 8 Feb 2024 13:41:57 +0800 Subject: [PATCH] upstream: flake --- flake.lock | 355 +++++++++++++++++++++++++++++++++--------- flake.nix | 7 +- nix/env.nix | 1 - nix/packages.nix | 13 +- scripts/ci/release.sh | 2 +- 5 files changed, 285 insertions(+), 93 deletions(-) diff --git a/flake.lock b/flake.lock index ef1e5a3..bb11881 100644 --- a/flake.lock +++ b/flake.lock @@ -1,37 +1,65 @@ { "nodes": { "atomipkgs": { + "inputs": { + "dev-atomi": "dev-atomi", + "dev-atomi_classic": "dev-atomi_classic_2", + "dev-npkgs": "dev-npkgs_2", + "dev-npkgs-unstable-05-Oct-2022": "dev-npkgs-unstable-05-Oct-2022_2", + "dev-npkgs-unstable-07-Feb-2024": "dev-npkgs-unstable-07-Feb-2024_2", + "dev-npkgs-unstable-11-Dec-2022": "dev-npkgs-unstable-11-Dec-2022_2", + "fenix": "fenix_2", + "flake-utils": "flake-utils_4", + "npkgs": "npkgs_2", + "npkgs-unstable": "npkgs-unstable_2" + }, + "locked": { + "lastModified": 1707362469, + "narHash": "sha256-rRk9DPJv0xdQrraAbYtP1yivcH5Mz4HhheWKroj/HTc=", + "owner": "kirinnee", + "repo": "test-nix-repo", + "rev": "6ff86a09a767d3e0d20994213e43de507c8a8c37", + "type": "github" + }, + "original": { + "owner": "kirinnee", + "ref": "v23.0.1", + "repo": "test-nix-repo", + "type": "github" + } + }, + "dev-atomi": { "inputs": { "dev-atomi_classic": "dev-atomi_classic", "dev-npkgs": "dev-npkgs", "dev-npkgs-unstable-05-Oct-2022": "dev-npkgs-unstable-05-Oct-2022", + "dev-npkgs-unstable-07-Feb-2024": "dev-npkgs-unstable-07-Feb-2024", "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": 1695526514, - "narHash": "sha256-kDwlfpgEqS/hrktjbZfpKldPFZKS68/d2zxfMPobK6c=", + "lastModified": 1707319132, + "narHash": "sha256-L5ekxE6MeA7URMF9M4Gdal5a5fSKAzCGyXGSepI8ozA=", "owner": "kirinnee", "repo": "test-nix-repo", - "rev": "82cce29ae2d3c150247d112c513e8be274218b91", + "rev": "099b7e7850d00d0e376aade2b9ad62683e6440a5", "type": "github" }, "original": { "owner": "kirinnee", - "ref": "v21.0.0", + "ref": "v23.0.0", "repo": "test-nix-repo", "type": "github" } }, - "atomipkgs_classic": { + "dev-atomi_classic": { "inputs": { - "flake-utils": "flake-utils_3", - "pkgs": "pkgs_2", - "pkgs_25_Jul_2021": "pkgs_25_Jul_2021_2" + "flake-utils": "flake-utils", + "pkgs": "pkgs", + "pkgs_25_Jul_2021": "pkgs_25_Jul_2021" }, "locked": { "lastModified": 1689236000, @@ -48,11 +76,11 @@ "type": "github" } }, - "dev-atomi_classic": { + "dev-atomi_classic_2": { "inputs": { - "flake-utils": "flake-utils", - "pkgs": "pkgs", - "pkgs_25_Jul_2021": "pkgs_25_Jul_2021" + "flake-utils": "flake-utils_3", + "pkgs": "pkgs_2", + "pkgs_25_Jul_2021": "pkgs_25_Jul_2021_2" }, "locked": { "lastModified": 1689236000, @@ -71,11 +99,11 @@ }, "dev-npkgs": { "locked": { - "lastModified": 1689048911, - "narHash": "sha256-pODI2CkjWbSLo5nPMZoLtkRNJU/Nr3VSITXZqqmNtIk=", + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8163a64662b43848802092d52015ef60777d6129", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "type": "github" }, "original": { @@ -100,6 +128,51 @@ "type": "indirect" } }, + "dev-npkgs-unstable-05-Oct-2022_2": { + "locked": { + "lastModified": 1664847737, + "narHash": "sha256-Wxl0CtRH3Vo8+qEZ/PbCcx+9D8wEEi56tJPmROum2ss=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "de80d1d04ee691279e1302a1128c082bbda3ab01", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "rev": "de80d1d04ee691279e1302a1128c082bbda3ab01", + "type": "indirect" + } + }, + "dev-npkgs-unstable-07-Feb-2024": { + "locked": { + "lastModified": 1707092692, + "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", + "type": "indirect" + } + }, + "dev-npkgs-unstable-07-Feb-2024_2": { + "locked": { + "lastModified": 1707092692, + "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", + "type": "indirect" + } + }, "dev-npkgs-unstable-11-Dec-2022": { "locked": { "lastModified": 1670681895, @@ -115,32 +188,67 @@ "type": "indirect" } }, - "dev-npkgs-unstable-20-Sep-2023": { + "dev-npkgs-unstable-11-Dec-2022_2": { "locked": { - "lastModified": 1694959747, - "narHash": "sha256-CXQ2MuledDVlVM5dLC4pB41cFlBWxRw4tCBsFrq3cRk=", + "lastModified": 1670681895, + "narHash": "sha256-kZH9DSU36W4fn1z81a/24JCGkU517TcY50VE0RFJ9k4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "970a59bd19eff3752ce552935687100c46e820a5", + "rev": "f82f0ec1b70b2879c3f3d9a1015a05c73a90a17c", "type": "github" }, "original": { "id": "nixpkgs", - "rev": "970a59bd19eff3752ce552935687100c46e820a5", + "rev": "f82f0ec1b70b2879c3f3d9a1015a05c73a90a17c", "type": "indirect" } }, + "dev-npkgs_2": { + "locked": { + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": "nixpkgs", "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1695709315, - "narHash": "sha256-XKzbb4NqYmUVlORwjCT//RGeQiJa+6LuGYllpaLP5lQ=", + "lastModified": 1706941198, + "narHash": "sha256-t6/qloMYdknVJ9a3QzjylQIZnQfgefJ5kMim50B7dwA=", "owner": "nix-community", "repo": "fenix", - "rev": "f5845b16d889d8bf9930fe1098820074da4cbce9", + "rev": "28dbd8b43ea328ee708f7da538c63e03d5ed93c8", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "fenix_2": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "rust-analyzer-src": "rust-analyzer-src_2" + }, + "locked": { + "lastModified": 1706941198, + "narHash": "sha256-t6/qloMYdknVJ9a3QzjylQIZnQfgefJ5kMim50B7dwA=", + "owner": "nix-community", + "repo": "fenix", + "rev": "28dbd8b43ea328ee708f7da538c63e03d5ed93c8", "type": "github" }, "original": { @@ -152,11 +260,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -188,11 +296,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -224,11 +332,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -242,11 +350,29 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "inputs": { + "systems": "systems_6" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -263,11 +389,11 @@ ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1703887061, + "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", "type": "github" }, "original": { @@ -278,11 +404,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695360818, - "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=", + "lastModified": 1706732774, + "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f", + "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d", "type": "github" }, "original": { @@ -309,21 +435,37 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "lastModified": 1704874635, + "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { + "locked": { + "lastModified": 1706732774, + "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1695360818, "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=", @@ -338,13 +480,13 @@ "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1685866647, - "narHash": "sha256-4jKguNHY/edLYImB+uL8jKPL/vpfOvMmSlLAGfxSrnY=", + "lastModified": 1704842529, + "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a53a3bec10deef6e1cc1caba5bc60f53b959b1e8", + "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", "type": "github" }, "original": { @@ -354,13 +496,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { - "lastModified": 1680945546, - "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", + "lastModified": 1705856552, + "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d", + "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", "type": "github" }, "original": { @@ -372,11 +514,11 @@ }, "npkgs": { "locked": { - "lastModified": 1689048911, - "narHash": "sha256-pODI2CkjWbSLo5nPMZoLtkRNJU/Nr3VSITXZqqmNtIk=", + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8163a64662b43848802092d52015ef60777d6129", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "type": "github" }, "original": { @@ -388,11 +530,27 @@ }, "npkgs-unstable": { "locked": { - "lastModified": 1689008574, - "narHash": "sha256-VFMgyHDiqsGDkRg73alv6OdHJAqhybryWHv77bSCGIw=", + "lastModified": 1707092692, + "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "npkgs-unstable_2": { + "locked": { + "lastModified": 1707092692, + "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4a729ce4b1fe5ec4fffc71c67c96aa5184ebb462", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", "type": "github" }, "original": { @@ -402,6 +560,22 @@ "type": "github" } }, + "npkgs_2": { + "locked": { + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "pkgs": { "locked": { "lastModified": 1643805626, @@ -465,17 +639,17 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1689328505, - "narHash": "sha256-9B3+OeUn1a/CvzE3GW6nWNwS5J7PDHTyHGlpL3wV5oA=", + "lastModified": 1707297608, + "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5e28316db471d1ac234beb70031b635437421dd6", + "rev": "0db2e67ee49910adfa13010e7f012149660af7f0", "type": "github" }, "original": { @@ -487,9 +661,8 @@ "root": { "inputs": { "atomipkgs": "atomipkgs", - "atomipkgs_classic": "atomipkgs_classic", - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_2", + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_3", "nixpkgs-sep-24-23": "nixpkgs-sep-24-23", "pre-commit-hooks": "pre-commit-hooks", "treefmt-nix": "treefmt-nix" @@ -498,11 +671,28 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1695642814, - "narHash": "sha256-xR1+YaPcutqXN7BYYCyHPU8VVh/gjW+bVFTfA+vHpv0=", + "lastModified": 1706875368, + "narHash": "sha256-KOBXxNurIU2lEmO6lR2A5El32X9x8ITt25McxKZ/Ew0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "d3cc3bc00e310ff49268ce0c593eaa6bf4724bbd", + "rev": "8f6a72871ec87ed53cfe43a09fb284168a284e7e", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-analyzer-src_2": { + "flake": false, + "locked": { + "lastModified": 1706875368, + "narHash": "sha256-KOBXxNurIU2lEmO6lR2A5El32X9x8ITt25McxKZ/Ew0=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "8f6a72871ec87ed53cfe43a09fb284168a284e7e", "type": "github" }, "original": { @@ -587,16 +777,31 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1689243103, - "narHash": "sha256-IfBt2AD8qCwZs+m6BlOGEitBIkVJ0iMscMueb6QYUk4=", + "lastModified": 1707300477, + "narHash": "sha256-qQF0fEkHlnxHcrKIMRzOETnRBksUK048MXkX0SOmxvA=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "f1dca68b908f3dd656b923b9fb62f7d755133662", + "rev": "ac599dab59a66304eb511af07b3883114f061b9d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5a5f7be..e0e4d8a 100644 --- a/flake.nix +++ b/flake.nix @@ -8,8 +8,7 @@ # registry nixpkgs.url = "nixpkgs/e35dcc04a3853da485a396bdd332217d0ac9054f"; nixpkgs-sep-24-23.url = "nixpkgs/e35dcc04a3853da485a396bdd332217d0ac9054f"; - atomipkgs.url = "github:kirinnee/test-nix-repo/v21.0.0"; - atomipkgs_classic.url = "github:kirinnee/test-nix-repo/classic"; + atomipkgs.url = "github:kirinnee/test-nix-repo/v23.0.1"; }; outputs = @@ -22,7 +21,6 @@ # registries , atomipkgs - , atomipkgs_classic , nixpkgs , nixpkgs-sep-24-23 @@ -34,7 +32,6 @@ pkgs = nixpkgs.legacyPackages.${system}; pkgs-sep-24-23 = nixpkgs-sep-24-23.legacyPackages.${system}; atomi = atomipkgs.packages.${system}; - atomi_classic = atomipkgs_classic.packages.${system}; pre-commit-lib = pre-commit-hooks.lib.${system}; in with rec { @@ -46,7 +43,7 @@ }; packages = import ./nix/packages.nix { - inherit pkgs pkgs-sep-24-23 atomi atomi_classic; + inherit pkgs pkgs-sep-24-23 atomi; }; env = import ./nix/env.nix { inherit pkgs packages; diff --git a/nix/env.nix b/nix/env.nix index 72cfe9b..3b6fed9 100644 --- a/nix/env.nix +++ b/nix/env.nix @@ -34,7 +34,6 @@ with packages; ]; releaser = [ - nodejs_20 sg ]; } diff --git a/nix/packages.nix b/nix/packages.nix index c8543e8..bd6ed50 100644 --- a/nix/packages.nix +++ b/nix/packages.nix @@ -1,4 +1,4 @@ -{ pkgs, atomi, atomi_classic, pkgs-sep-24-23 }: +{ pkgs, atomi, pkgs-sep-24-23 }: let all = { @@ -7,13 +7,7 @@ let { inherit infisical - pls; - } - ); - atomipkgs_classic = ( - with atomi_classic; - { - inherit + pls sg; } ); @@ -28,8 +22,6 @@ let jq yq-go - nodejs_20 - # lint treefmt @@ -48,5 +40,4 @@ let in with all; atomipkgs // -atomipkgs_classic // sep-24-23 diff --git a/scripts/ci/release.sh b/scripts/ci/release.sh index a0950a9..85a97db 100755 --- a/scripts/ci/release.sh +++ b/scripts/ci/release.sh @@ -3,4 +3,4 @@ set -eou pipefail rm .git/hooks/* || true -sg release +sg release -i npm