Skip to content

Commit

Permalink
feat(flake): bump nixpkgs to 24.11 and buildbot-nix (#183)
Browse files Browse the repository at this point in the history
* feat(flake): bump to nixos-24.11 and buildbot-nix

* fix(monitoring): remove alloy import from unstable

* refactor(buildbot-nix-0): remove unused monitoring.nix

* dweb-reverse-tls-proxy: disable nomad

* refactor(modules): extract nomad-server module

* chore: bump nomad to latest version

* fix(modules/flake-parts/packages.postbuildstepper/test): wait until minio is live
  • Loading branch information
steveej authored Dec 12, 2024
1 parent 3a9b18b commit b0712b0
Show file tree
Hide file tree
Showing 15 changed files with 222 additions and 219 deletions.
5 changes: 4 additions & 1 deletion .envrc
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
#!/usr/bin/env bash

if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
fi

if [[ "$(hostname)" =~ (steveej|sj-).* ]]; then
export PULUMI_CONFIG_PASSPHRASE="$(prs show Work/Holo/holochain-infra-pulumi-passphrase)"
PULUMI_CONFIG_PASSPHRASE="$(prs show Work/Holo/holochain-infra-pulumi-passphrase)"
export PULUMI_CONFIG_PASSPHRASE
fi

use flake
3 changes: 1 addition & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@ on:
push:
branches: [develop]


jobs:
os:
strategy:
fail-fast: false
matrix:
os: [ ]
os: []
name: OS
runs-on: ${{ matrix.os }}
permissions:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/turn-readiness-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
id-token: "write"
contents: "read"
steps:
- uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@main
- uses: DeterminateSystems/magic-nix-cache-action@main
- name: Run script
run: nix run .\#turn-readiness-check
- uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@main
- uses: DeterminateSystems/magic-nix-cache-action@main
- name: Run script
run: nix run .\#turn-readiness-check
8 changes: 4 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"nixEnvSelector.nixFile": "${workspaceRoot}/flake.nix",
"[nix]": {
"editor.defaultFormatter": null,
},
"nixEnvSelector.nixFile": "${workspaceRoot}/flake.nix",
"[nix]": {
"editor.defaultFormatter": null
}
}
75 changes: 59 additions & 16 deletions flake.lock

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

15 changes: 8 additions & 7 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,17 @@

nix-filter.url = "github:numtide/nix-filter";

nixpkgs.follows = "nixpkgs-24-05";
nixpkgs.follows = "nixpkgs-24-11";
nixpkgs-23-11 = {
url = "github:nixos/nixpkgs/nixos-23.11";
};
nixpkgs-24-05 = {
url = "github:nixos/nixpkgs/nixos-24.05";
};
nixpkgsNix.follows = "nixpkgs-24-05";
nixpkgs-24-11 = {
url = "github:nixos/nixpkgs/nixos-24.11";
};
nixpkgsNix.follows = "nixpkgs-24-11";
nixpkgsGithubActionRunners = {
url = "github:nixos/nixpkgs/nixos-unstable";
};
Expand Down Expand Up @@ -44,7 +47,7 @@
darwin.inputs.nixpkgs.follows = "nixpkgs";

# home manager
home-manager.url = "github:nix-community/home-manager/release-24.05";
home-manager.url = "github:nix-community/home-manager/release-24.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs";

# secret management
Expand Down Expand Up @@ -213,7 +216,7 @@

# do not forward 'nixpkgs' there as buildbot-nix uses custom buildbot patches
buildbot-nix.url = "github:nix-community/buildbot-nix";
buildbot-nix.inputs.nixpkgs.follows = "nixpkgsUnstable";
buildbot-nix.inputs.nixpkgs.follows = "nixpkgs-24-11";
};

outputs =
Expand Down Expand Up @@ -434,7 +437,7 @@
pulumi-command
]
))
pkgs.go_1_21
pkgs.go_1_23
]
++ (
let
Expand All @@ -452,8 +455,6 @@

packages =
{
# nomad = pkgs.nomad_1_6;

nixos-anywhere = inputs'.nixos-anywhere.packages.default;
}
// (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@
boot.loader.efi.canTouchEfiVariables = false;
boot.kernelPackages = pkgs.linuxPackages_latest;

systemd.network.networks."10-uplink".networkConfig.Address = "${config.passthru.primaryIpv6}/${config.passthru.primaryIpv6Suffix}";
systemd.network.networks."10-uplink".networkConfig.Address =
"${config.passthru.primaryIpv6}/${config.passthru.primaryIpv6Suffix}";

disko.devices =
let
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
...
}:
let
evaluatedSystem = inputs.nixpkgsUnstable.lib.nixosSystem {
evaluatedSystem = inputs.nixpkgs.lib.nixosSystem {
modules = [ ./configuration.nix ];
system = "x86_64-linux";
specialArgs = self.specialArgs;
Expand Down

This file was deleted.

Loading

0 comments on commit b0712b0

Please sign in to comment.