From 1afe53d15d07ea4487f58dbc3a07f529aeec7b87 Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 24 Jan 2023 15:51:32 +0100 Subject: [PATCH] change 0x76.dev tag to build-num --- flake.nix | 33 ++++++++-------------------- flux/olympus/apps/websites/0x76.yaml | 2 +- 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/flake.nix b/flake.nix index 7a57b00..38776a0 100644 --- a/flake.nix +++ b/flake.nix @@ -48,20 +48,8 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; }; - outputs = - { self - , nixpkgs - , nixpkgs_22-11 - , vault-secrets - , colmena - , home-manager - , hyprpaper - , hyprland - , nixos-generators - , nixos-hardware - , nur - , ... - }@inputs: + outputs = { self, nixpkgs, nixpkgs_22-11, vault-secrets, colmena, home-manager + , hyprpaper, hyprland, nixos-generators, nixos-hardware, nur, ... }@inputs: let inherit (nixpkgs) lib; @@ -105,8 +93,7 @@ source /etc/set-environment nix repl --file "${./.}/repl.nix" $@ ''; - in - { + in { # Make the nixosConfigurations for compat reasons nixosConfigurations = (import (inputs.colmena + "/src/nix/hive/eval.nix") { @@ -118,14 +105,12 @@ }).nodes; # Make the colmena configuration - colmena = lib.foldr (el: acc: acc // util.mkColmenaHost el) - { - meta = { - inherit specialArgs; - nixpkgs = pkgs; - }; - } - nixHosts; + colmena = lib.foldr (el: acc: acc // util.mkColmenaHost el) { + meta = { + inherit specialArgs; + nixpkgs = pkgs; + }; + } nixHosts; packages.${system} = { inherit apply-local; diff --git a/flux/olympus/apps/websites/0x76.yaml b/flux/olympus/apps/websites/0x76.yaml index d81ec0f..9fa91a6 100644 --- a/flux/olympus/apps/websites/0x76.yaml +++ b/flux/olympus/apps/websites/0x76.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: x76dev - image: git.0x76.dev/v/0x76.dev:latest + image: git.0x76.dev/v/0x76.dev:4 ports: - containerPort: 80 ---