Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update infra to NixOS 24.11 #321

Merged
merged 4 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
170 changes: 55 additions & 115 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 26 additions & 7 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,58 +1,77 @@
# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
# SPDX-License-Identifier: Apache-2.0
{
description = "NixOS configurations for Ghaf";
description = "NixOS configurations for Ghaf Infra";

inputs = {
# Nixpkgs
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";

# jenkins-job-builder is broken on 24.11 currently
nixpkgs-24-05.url = "github:nixos/nixpkgs/nixos-24.05";

# Allows us to structure the flake with the NixOS module system
flake-parts.url = "github:hercules-ci/flake-parts";
flake-root.url = "github:srid/flake-root";

# Secrets with sops-nix
sops-nix = {
url = "github:mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs-stable.follows = "nixpkgs";
};

# Disko for disk partitioning
disko = {
url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs";
};

# Format all the things
treefmt-nix = {
url = "github:numtide/treefmt-nix";
inputs.nixpkgs.follows = "nixpkgs";
};

# For preserving compatibility with non-Flake users
flake-compat = {
url = "github:nix-community/flake-compat";
flake = false;
};

# Used for deploying remote systems
deploy-rs = {
url = "github:serokell/deploy-rs";
inputs.nixpkgs.follows = "nixpkgs";
inputs = {
nixpkgs.follows = "nixpkgs";
};
};
# pipeline dependencies

# Utilities used in the jenkins pipelines
robot-framework = {
url = "github:tiiuae/ci-test-automation";
inputs.nixpkgs.follows = "nixpkgs";
};
sbomnix = {
url = "github:tiiuae/sbomnix";
inputs.nixpkgs.follows = "nixpkgs";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-parts.follows = "flake-parts";
flake-compat.follows = "flake-compat";
flake-root.follows = "flake-root";
treefmt-nix.follows = "treefmt-nix";
};
};
ci-yubi = {
url = "github:tiiuae/ci-yubi";
inputs.nixpkgs.follows = "nixpkgs";
};

# Installed into devshell
nix-fast-build = {
url = "github:Mic92/nix-fast-build";
inputs = {
flake-parts.follows = "flake-parts";
nixpkgs.follows = "nixpkgs";
flake-parts.follows = "flake-parts";
treefmt-nix.follows = "treefmt-nix";
};
};
Expand Down
Loading
Loading