diff --git a/.envrc b/.envrc index b819d1c..8792cb0 100644 --- a/.envrc +++ b/.envrc @@ -1,2 +1,2 @@ -nix_direnv_watch_file "./nix/env.nix" "./nix/fmt.nix" "./nix/packages.nix" "./nix/shells.nix" "./nix/pre-commit.nix" "./flake.nix" "./parse.nix" +watch_file "./nix/env.nix" "./nix/fmt.nix" "./nix/packages.nix" "./nix/shells.nix" "./nix/pre-commit.nix" "./flake.nix" "./parse.nix" use flake diff --git a/.github/workflows/deployment.yaml b/.github/workflows/deployment.yaml index 9385c25..7202b8f 100644 --- a/.github/workflows/deployment.yaml +++ b/.github/workflows/deployment.yaml @@ -6,11 +6,13 @@ on: jobs: precommit: name: Pre-commit Check - runs-on: ubuntu-22.04 + runs-on: + - nscloud-ubuntu-22.04-amd64-4x8-with-cache + - nscloud-cache-size-50gb + - nscloud-cache-tag-sulfoxide-lead-nix-store-cache + - nscloud-git-mirror-1gb steps: - - uses: actions/checkout@v3 - - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main + - uses: AtomiCloud/actions.setup-nix@v1.2.1 - name: Run pre-commit run: nix develop .#ci -c ./scripts/ci/pre-commit.sh @@ -19,12 +21,14 @@ jobs: needs: - precommit if: github.ref == 'refs/heads/main' - runs-on: ubuntu-latest + runs-on: + - nscloud-ubuntu-22.04-amd64-4x8-with-cache + - nscloud-cache-size-50gb + - nscloud-cache-tag-sulfoxide-lead-releaser-nix-store-cache + - nscloud-git-mirror-1gb steps: - - uses: actions/checkout@v3 - - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main - - uses: rlespinasse/github-slug-action@v3.x + - uses: AtomiCloud/actions.setup-nix@v1.2.1 + - uses: AtomiCloud/actions.cache-npm@v1.0.1 - name: Release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/chart/Chart.lock b/chart/Chart.lock index 393ce5e..6361932 100644 --- a/chart/Chart.lock +++ b/chart/Chart.lock @@ -1,12 +1,12 @@ dependencies: - name: aws-ebs-csi-driver repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver - version: 2.27.0 + version: 2.33.0 - name: aws-efs-csi-driver repository: https://kubernetes-sigs.github.io/aws-efs-csi-driver - version: 2.5.5 + version: 3.0.8 - name: aws-load-balancer-controller repository: https://aws.github.io/eks-charts - version: 1.7.1 -digest: sha256:d570d434004ba9f774b6b657bbccf548e1148582a7135377d1400ddf40beb409 -generated: "2024-02-17T17:04:56.971697+08:00" + version: 1.8.2 +digest: sha256:2d2dabbe934e42517796a7076e78bcf01ebd3040de135c8ede5a7c8ad9c61353 +generated: "2024-08-11T11:48:13.95673+08:00" diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 1f458d2..6418cc7 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -7,13 +7,13 @@ appVersion: "0.1.0" dependencies: - name: aws-ebs-csi-driver repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver - version: 2.27.0 + version: 2.33.0 condition: aws-ebs-csi-driver.enabled - name: aws-efs-csi-driver repository: https://kubernetes-sigs.github.io/aws-efs-csi-driver - version: 2.5.5 + version: 3.0.8 condition: aws-efs-csi-driver.enabled - name: aws-load-balancer-controller repository: https://aws.github.io/eks-charts - version: 1.7.1 + version: 1.8.2 condition: aws-load-balancer-controller.enabled diff --git a/chart/README.md b/chart/README.md index 5488e33..2a89437 100644 --- a/chart/README.md +++ b/chart/README.md @@ -8,9 +8,9 @@ Helm chart to deploy EKS Bootstrap components includingg CSI (EBS and EFS) and L | Repository | Name | Version | |------------|------|---------| -| https://aws.github.io/eks-charts | aws-load-balancer-controller | 1.7.1 | -| https://kubernetes-sigs.github.io/aws-ebs-csi-driver | aws-ebs-csi-driver | 2.27.0 | -| https://kubernetes-sigs.github.io/aws-efs-csi-driver | aws-efs-csi-driver | 2.5.5 | +| https://aws.github.io/eks-charts | aws-load-balancer-controller | 1.8.2 | +| https://kubernetes-sigs.github.io/aws-ebs-csi-driver | aws-ebs-csi-driver | 2.33.0 | +| https://kubernetes-sigs.github.io/aws-efs-csi-driver | aws-efs-csi-driver | 3.0.8 | ## Values @@ -31,4 +31,4 @@ Helm chart to deploy EKS Bootstrap components includingg CSI (EBS and EFS) and L | zoneSpread.zones | object | `{"zone1":{"enabled":false,"replicas":1,"zone":"ap-southeast-1a"}}` | topology zones to deploy zone-spread pod to force node provisioning across zones | ---------------------------------------------- -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.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/chart/charts/aws-ebs-csi-driver-2.27.0.tgz b/chart/charts/aws-ebs-csi-driver-2.27.0.tgz deleted file mode 100644 index 30e17a6..0000000 Binary files a/chart/charts/aws-ebs-csi-driver-2.27.0.tgz and /dev/null differ diff --git a/chart/charts/aws-ebs-csi-driver-2.33.0.tgz b/chart/charts/aws-ebs-csi-driver-2.33.0.tgz new file mode 100644 index 0000000..a0d9189 Binary files /dev/null and b/chart/charts/aws-ebs-csi-driver-2.33.0.tgz differ diff --git a/chart/charts/aws-efs-csi-driver-2.5.5.tgz b/chart/charts/aws-efs-csi-driver-2.5.5.tgz deleted file mode 100644 index 3b09e9a..0000000 Binary files a/chart/charts/aws-efs-csi-driver-2.5.5.tgz and /dev/null differ diff --git a/chart/charts/aws-efs-csi-driver-3.0.8.tgz b/chart/charts/aws-efs-csi-driver-3.0.8.tgz new file mode 100644 index 0000000..8f5821c Binary files /dev/null and b/chart/charts/aws-efs-csi-driver-3.0.8.tgz differ diff --git a/chart/charts/aws-load-balancer-controller-1.7.1.tgz b/chart/charts/aws-load-balancer-controller-1.7.1.tgz deleted file mode 100644 index d796146..0000000 Binary files a/chart/charts/aws-load-balancer-controller-1.7.1.tgz and /dev/null differ diff --git a/chart/charts/aws-load-balancer-controller-1.8.2.tgz b/chart/charts/aws-load-balancer-controller-1.8.2.tgz new file mode 100644 index 0000000..9237330 Binary files /dev/null and b/chart/charts/aws-load-balancer-controller-1.8.2.tgz differ diff --git a/chart/values.entei.amber.yaml b/chart/values.entei.amber.yaml new file mode 100644 index 0000000..a3f0eec --- /dev/null +++ b/chart/values.entei.amber.yaml @@ -0,0 +1,80 @@ +serviceTree: + landscape: &landscape entei + cluster: &cluster amber +tags: &tags + atomi.cloud/landscape: *landscape + atomi.cloud/cluster: *cluster +clusterName: &clusterName entei-amber +role: &role "" +aws-ebs-csi-driver: + enabled: true + customLabels: + !!merge <<: *tags + storageClasses: + - name: ebs-gp3 + annotations: + storageclass.kubernetes.io/is-default-class: "true" + labels: + !!merge <<: *tags + tr8.io/layer: "1" + volumeBindingMode: WaitForFirstConsumer + reclaimPolicy: Retain + parameters: + type: gp3 + encrypted: "true" + controller: + replicaCount: 2 + podLabels: + !!merge <<: *tags + podAnnotations: + !!merge <<: *tags + serviceAccount: + annotations: + eks.amazonaws.com/role-arn: *role + extraVolumeTags: + !!merge <<: *tags +aws-efs-csi-driver: + enabled: false + storageClasses: + - name: efs + labels: + !!merge <<: *tags + tr8.io/layer: "1" + volumeBindingMode: WaitForFirstConsumer + reclaimPolicy: Retain + parameters: {} + replicaCount: 2 + controller: + serviceAccount: + annotations: + eks.amazonaws.com/role-arn: *role + create: true + podAnnotations: + !!merge <<: *tags +aws-load-balancer-controller: + enabled: true + clusterName: *clusterName + replicaCount: 2 + serviceAccount: + annotations: + eks.amazonaws.com/role-arn: *role + additionalLabels: + !!merge <<: *tags + podLabels: + !!merge <<: *tags + podAnnotations: + !!merge <<: *tags +zoneSpread: + zones: + zone1: + zone: ap-southeast-1a + enabled: true + replicas: 1 + zone2: + zone: ap-southeast-1b + enabled: true + replicas: 1 + zone3: + zone: ap-southeast-1c + enabled: true + replicas: 1 diff --git a/chart/values.entei.topaz.yaml b/chart/values.entei.topaz.yaml new file mode 100644 index 0000000..9e5e88c --- /dev/null +++ b/chart/values.entei.topaz.yaml @@ -0,0 +1,80 @@ +serviceTree: + landscape: &landscape entei + cluster: &cluster topaz +tags: &tags + atomi.cloud/landscape: *landscape + atomi.cloud/cluster: *cluster +clusterName: &clusterName entei-topaz +role: &role "arn:aws:iam::021891601985:role/entei-topaz-irsa" +aws-ebs-csi-driver: + enabled: true + customLabels: + !!merge <<: *tags + storageClasses: + - name: ebs-gp3 + annotations: + storageclass.kubernetes.io/is-default-class: "true" + labels: + !!merge <<: *tags + tr8.io/layer: "1" + volumeBindingMode: WaitForFirstConsumer + reclaimPolicy: Retain + parameters: + type: gp3 + encrypted: "true" + controller: + replicaCount: 2 + podLabels: + !!merge <<: *tags + podAnnotations: + !!merge <<: *tags + serviceAccount: + annotations: + eks.amazonaws.com/role-arn: *role + extraVolumeTags: + !!merge <<: *tags +aws-efs-csi-driver: + enabled: false + storageClasses: + - name: efs + labels: + !!merge <<: *tags + tr8.io/layer: "1" + volumeBindingMode: WaitForFirstConsumer + reclaimPolicy: Retain + parameters: {} + replicaCount: 2 + controller: + serviceAccount: + annotations: + eks.amazonaws.com/role-arn: *role + create: true + podAnnotations: + !!merge <<: *tags +aws-load-balancer-controller: + enabled: true + clusterName: *clusterName + replicaCount: 2 + serviceAccount: + annotations: + eks.amazonaws.com/role-arn: *role + additionalLabels: + !!merge <<: *tags + podLabels: + !!merge <<: *tags + podAnnotations: + !!merge <<: *tags +zoneSpread: + zones: + zone1: + zone: ap-southeast-1a + enabled: true + replicas: 1 + zone2: + zone: ap-southeast-1b + enabled: true + replicas: 1 + zone3: + zone: ap-southeast-1c + enabled: true + replicas: 1 diff --git a/flake.lock b/flake.lock index bb11881..3e90208 100644 --- a/flake.lock +++ b/flake.lock @@ -3,6 +3,35 @@ "atomipkgs": { "inputs": { "dev-atomi": "dev-atomi", + "dev-atomi_classic": "dev-atomi_classic_3", + "dev-npkgs": "dev-npkgs_3", + "dev-npkgs-unstable-05-Jun-2024": "dev-npkgs-unstable-05-Jun-2024", + "dev-npkgs-unstable-05-Oct-2022": "dev-npkgs-unstable-05-Oct-2022_3", + "dev-npkgs-unstable-07-Feb-2024": "dev-npkgs-unstable-07-Feb-2024_3", + "dev-npkgs-unstable-11-Dec-2022": "dev-npkgs-unstable-11-Dec-2022_3", + "fenix": "fenix_3", + "flake-utils": "flake-utils_6", + "npkgs": "npkgs_3", + "npkgs-unstable": "npkgs-unstable_3" + }, + "locked": { + "lastModified": 1720858656, + "narHash": "sha256-k/EE+GrQYP0BDYhdS/YWULMNrewZm4Y7+wWncal4Udk=", + "owner": "kirinnee", + "repo": "test-nix-repo", + "rev": "164d6fd91e41410bfd0d8737ec77388346045665", + "type": "github" + }, + "original": { + "owner": "kirinnee", + "ref": "v27.0.0", + "repo": "test-nix-repo", + "type": "github" + } + }, + "dev-atomi": { + "inputs": { + "dev-atomi": "dev-atomi_2", "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", @@ -28,7 +57,7 @@ "type": "github" } }, - "dev-atomi": { + "dev-atomi_2": { "inputs": { "dev-atomi_classic": "dev-atomi_classic", "dev-npkgs": "dev-npkgs", @@ -97,6 +126,27 @@ "type": "github" } }, + "dev-atomi_classic_3": { + "inputs": { + "flake-utils": "flake-utils_5", + "pkgs": "pkgs_3", + "pkgs_25_Jul_2021": "pkgs_25_Jul_2021_3" + }, + "locked": { + "lastModified": 1689236000, + "narHash": "sha256-MEqyIPlD4ueJji6FtfDs8qqZifM9hyYH1svBs3oxrrc=", + "owner": "kirinnee", + "repo": "test-nix-repo", + "rev": "2d9d80544d2e81ff736fa23345ad0a9cc5a6c8ab", + "type": "github" + }, + "original": { + "owner": "kirinnee", + "ref": "classic", + "repo": "test-nix-repo", + "type": "github" + } + }, "dev-npkgs": { "locked": { "lastModified": 1704290814, @@ -113,6 +163,21 @@ "type": "github" } }, + "dev-npkgs-unstable-05-Jun-2024": { + "locked": { + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", + "type": "indirect" + } + }, "dev-npkgs-unstable-05-Oct-2022": { "locked": { "lastModified": 1664847737, @@ -143,6 +208,21 @@ "type": "indirect" } }, + "dev-npkgs-unstable-05-Oct-2022_3": { + "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, @@ -173,6 +253,21 @@ "type": "indirect" } }, + "dev-npkgs-unstable-07-Feb-2024_3": { + "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, @@ -203,6 +298,21 @@ "type": "indirect" } }, + "dev-npkgs-unstable-11-Dec-2022_3": { + "locked": { + "lastModified": 1670681895, + "narHash": "sha256-kZH9DSU36W4fn1z81a/24JCGkU517TcY50VE0RFJ9k4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f82f0ec1b70b2879c3f3d9a1015a05c73a90a17c", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "rev": "f82f0ec1b70b2879c3f3d9a1015a05c73a90a17c", + "type": "indirect" + } + }, "dev-npkgs_2": { "locked": { "lastModified": 1704290814, @@ -219,6 +329,22 @@ "type": "github" } }, + "dev-npkgs_3": { + "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", @@ -257,6 +383,25 @@ "type": "github" } }, + "fenix_3": { + "inputs": { + "nixpkgs": "nixpkgs_3", + "rust-analyzer-src": "rust-analyzer-src_3" + }, + "locked": { + "lastModified": 1706941198, + "narHash": "sha256-t6/qloMYdknVJ9a3QzjylQIZnQfgefJ5kMim50B7dwA=", + "owner": "nix-community", + "repo": "fenix", + "rev": "28dbd8b43ea328ee708f7da538c63e03d5ed93c8", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -349,6 +494,24 @@ "inputs": { "systems": "systems_5" }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "inputs": { + "systems": "systems_6" + }, "locked": { "lastModified": 1705309234, "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", @@ -363,9 +526,27 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_7": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" + }, + "locked": { + "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_8": { + "inputs": { + "systems": "systems_8" }, "locked": { "lastModified": 1701680307, @@ -418,18 +599,18 @@ "type": "github" } }, - "nixpkgs-sep-24-23": { + "nixpkgs-240810": { "locked": { - "lastModified": 1695360818, - "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=", + "lastModified": 1723175592, + "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f", + "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "type": "github" }, "original": { "id": "nixpkgs", - "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f", + "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "type": "indirect" } }, @@ -467,20 +648,36 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1695360818, - "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=", + "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_4": { + "locked": { + "lastModified": 1723175592, + "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f", + "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "type": "github" }, "original": { "id": "nixpkgs", - "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f", + "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "type": "indirect" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1704842529, "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", @@ -496,7 +693,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1705856552, "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", @@ -560,6 +757,22 @@ "type": "github" } }, + "npkgs-unstable_3": { + "locked": { + "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_2": { "locked": { "lastModified": 1704290814, @@ -576,6 +789,22 @@ "type": "github" } }, + "npkgs_3": { + "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, @@ -636,12 +865,42 @@ "type": "indirect" } }, + "pkgs_25_Jul_2021_3": { + "locked": { + "lastModified": 1627107260, + "narHash": "sha256-CwvSwz3kvpp7uEFyOj2Dq6bdtY6P2N0Bzd7ZVgsIICw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "537678cb1ead06fca831077c3b193566cbc3f406", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "rev": "537678cb1ead06fca831077c3b193566cbc3f406", + "type": "indirect" + } + }, + "pkgs_3": { + "locked": { + "lastModified": 1643805626, + "narHash": "sha256-AXLDVMG+UaAGsGSpOtQHPIKB+IZ0KSd9WS77aanGzgc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "554d2d8aa25b6e583575459c297ec23750adb6cb", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "rev": "554d2d8aa25b6e583575459c297ec23750adb6cb", + "type": "indirect" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_8", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -661,9 +920,9 @@ "root": { "inputs": { "atomipkgs": "atomipkgs", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_3", - "nixpkgs-sep-24-23": "nixpkgs-sep-24-23", + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_4", + "nixpkgs-240810": "nixpkgs-240810", "pre-commit-hooks": "pre-commit-hooks", "treefmt-nix": "treefmt-nix" } @@ -702,6 +961,23 @@ "type": "github" } }, + "rust-analyzer-src_3": { + "flake": false, + "locked": { + "lastModified": 1706875368, + "narHash": "sha256-KOBXxNurIU2lEmO6lR2A5El32X9x8ITt25McxKZ/Ew0=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "8f6a72871ec87ed53cfe43a09fb284168a284e7e", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -792,9 +1068,39 @@ "type": "github" } }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_8": { + "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_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1707300477, diff --git a/flake.nix b/flake.nix index 7276f00..cc48689 100644 --- a/flake.nix +++ b/flake.nix @@ -6,9 +6,9 @@ pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; # registry - nixpkgs.url = "nixpkgs/e35dcc04a3853da485a396bdd332217d0ac9054f"; - nixpkgs-sep-24-23.url = "nixpkgs/e35dcc04a3853da485a396bdd332217d0ac9054f"; - atomipkgs.url = "github:kirinnee/test-nix-repo/v23.0.1"; + nixpkgs.url = "nixpkgs/5e0ca22929f3342b19569b21b2f3462f053e497b"; + nixpkgs-240810.url = "nixpkgs/5e0ca22929f3342b19569b21b2f3462f053e497b"; + atomipkgs.url = "github:kirinnee/test-nix-repo/v27.0.0"; }; outputs = { self @@ -21,7 +21,7 @@ # registries , atomipkgs , nixpkgs - , nixpkgs-sep-24-23 + , nixpkgs-240810 } @inputs: (flake-utils.lib.eachDefaultSystem @@ -29,7 +29,7 @@ system: let pkgs = nixpkgs.legacyPackages.${system}; - pkgs-sep-24-23 = nixpkgs-sep-24-23.legacyPackages.${system}; + pkgs-240810 = nixpkgs-240810.legacyPackages.${system}; atomi = atomipkgs.packages.${system}; pre-commit-lib = pre-commit-hooks.lib.${system}; in @@ -42,7 +42,7 @@ }; packages = import ./nix/packages.nix { - inherit pkgs pkgs-sep-24-23 atomi; + inherit pkgs pkgs-240810 atomi; }; env = import ./nix/env.nix { inherit pkgs packages; diff --git a/nix/packages.nix b/nix/packages.nix index 7cb5a4a..43c7254 100644 --- a/nix/packages.nix +++ b/nix/packages.nix @@ -1,4 +1,4 @@ -{ pkgs, atomi, pkgs-sep-24-23 }: +{ pkgs, atomi, pkgs-240810 }: let all = { @@ -6,13 +6,12 @@ let with atomi; { inherit - infisical pls sg; } ); - sep-24-23 = ( - with pkgs-sep-24-23; + pkgs240810 = ( + with pkgs-240810; { inherit coreutils @@ -25,6 +24,7 @@ let # lint treefmt + infisical # infra k3d @@ -41,4 +41,4 @@ let in with all; atomipkgs // -sep-24-23 +pkgs240810