From 3caa66fb640aa72649fe32c74b5c593cd06b9a75 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sun, 5 Nov 2023 01:22:36 +0100 Subject: [PATCH] rename input: unstable -> nixpkgs-unstable --- README.MD | 2 +- base.nix | 2 +- flake.lock | 66 +++++++++---------- flake.nix | 12 ++-- .../services/metrics/prometheus/mysqld.nix | 2 +- 5 files changed, 41 insertions(+), 43 deletions(-) diff --git a/README.MD b/README.MD index 904272c..a92222b 100644 --- a/README.MD +++ b/README.MD @@ -26,7 +26,7 @@ Det er sikkert lurt å lage en PR først om du ikke er vandt til nix enda. Innen 24h skal alle systemene hente ned den nye konfigurasjonen og deploye den. Du kan tvinge en maskin til å oppdatere seg før dette ved å kjøre: -`nixos-rebuild switch --update-input nixpkgs --update-input unstable --no-write-lock-file --refresh --flake git+https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git --upgrade` +`nixos-rebuild switch --update-input nixpkgs --update-input nixpkgs-unstable --no-write-lock-file --refresh --flake git+https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git --upgrade` som root på maskinen. diff --git a/base.nix b/base.nix index f839f9f..fdc8ff5 100644 --- a/base.nix +++ b/base.nix @@ -32,7 +32,7 @@ flake = "git+https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git"; flags = [ "--update-input" "nixpkgs" - "--update-input" "unstable" + "--update-input" "nixpkgs-unstable" "--no-write-lock-file" ]; }; diff --git a/flake.lock b/flake.lock index 2ca51b4..ecdfc44 100644 --- a/flake.lock +++ b/flake.lock @@ -3,7 +3,7 @@ "grzegorz": { "inputs": { "nixpkgs": [ - "unstable" + "nixpkgs-unstable" ] }, "locked": { @@ -45,11 +45,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1697420972, - "narHash": "sha256-eFDasOzXAN8VswUntNBBwvKFyVKFvmwRNNVTDfGdB3M=", + "lastModified": 1697936579, + "narHash": "sha256-nMyepKnwoHMzu2OpXvG2ZhU081TV9ENmWCo0vWxs6AI=", "owner": "dali99", "repo": "nixos-matrix-modules", - "rev": "1e370b96223b94d52006249a60033caaea605c65", + "rev": "e09814657187c8ed1a5fe1646df6d8da1eb2dee9", "type": "github" }, "original": { @@ -60,18 +60,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697706247, - "narHash": "sha256-nWLggeUxn/l8JrcQr9f+RfnCXp8cn0BN568PjMJh9ko=", + "lastModified": 1699024625, + "narHash": "sha256-abDyXs00jZtQcTrujB/a9MaIp7VY5v1VDVCF4zhXVYE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4ee5b576ac2861a818950aea99f609d7a6fc02a3", + "rev": "556a75f6a1302b6718fecd3ca8cbd109eb6cb067", "type": "github" }, "original": { - "owner": "NixOS", + "id": "nixpkgs", "ref": "nixos-23.05-small", - "repo": "nixpkgs", - "type": "github" + "type": "indirect" } }, "nixpkgs-lib": { @@ -91,11 +90,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1697332183, - "narHash": "sha256-ACYvYsgLETfEI2xM1jjp8ZLVNGGC0onoCGe+69VJGGE=", + "lastModified": 1698544399, + "narHash": "sha256-vhRmPyEyoPkrXF2iykBsWHA05MIaOSmMRLMF7Hul6+s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e1cff585c1a85aeab059d3109f66134a8f76935", + "rev": "d87c5d8c41c9b3b39592563242f3a448b5cc4bc9", "type": "github" }, "original": { @@ -105,6 +104,21 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1699087154, + "narHash": "sha256-Eq8VMqpRtMonqeOlLi+F86S39l+RLx/0EbqystNaswc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e4082efedb483eb0478c3f014fa851449bca43f9", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable-small", + "type": "indirect" + } + }, "pvv-calendar-bot": { "inputs": { "nixpkgs": [ @@ -131,9 +145,9 @@ "grzegorz-clients": "grzegorz-clients", "matrix-next": "matrix-next", "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable", "pvv-calendar-bot": "pvv-calendar-bot", - "sops-nix": "sops-nix", - "unstable": "unstable" + "sops-nix": "sops-nix" } }, "sops-nix": { @@ -144,11 +158,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1697339241, - "narHash": "sha256-ITsFtEtRbCBeEH9XrES1dxZBkE1fyNNUfIyQjQ2AYQs=", + "lastModified": 1699021419, + "narHash": "sha256-oy2j2OHXYcckifASMeZzpmbDLSvobMGt0V/RvoDotF4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "51186b8012068c417dac7c31fb12861726577898", + "rev": "275b28593ef3a1b9d05b6eeda3ddce2f45f5c06f", "type": "github" }, "original": { @@ -156,22 +170,6 @@ "repo": "sops-nix", "type": "github" } - }, - "unstable": { - "locked": { - "lastModified": 1697713104, - "narHash": "sha256-DN7YOyKMCpAVeZ44N42LrujtTkoerkS9+kTufQiuntY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6be2c349a30fcb489a3153dd331e9df387ab6449", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index ed131af..b972072 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,8 @@ description = "PVV System flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05-small"; - unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small"; + nixpkgs.url = "nixpkgs/nixos-23.05-small"; + nixpkgs-unstable.url = "nixpkgs/nixos-unstable-small"; sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; @@ -14,12 +14,12 @@ matrix-next.url = "github:dali99/nixos-matrix-modules"; grzegorz.url = "github:Programvareverkstedet/grzegorz"; - grzegorz.inputs.nixpkgs.follows = "unstable"; + grzegorz.inputs.nixpkgs.follows = "nixpkgs-unstable"; grzegorz-clients.url = "github:Programvareverkstedet/grzegorz-clients"; grzegorz-clients.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, nixpkgs, matrix-next, pvv-calendar-bot, unstable, sops-nix, ... }@inputs: + outputs = { self, nixpkgs, matrix-next, pvv-calendar-bot, nixpkgs-unstable, sops-nix, ... }@inputs: let nixlib = nixpkgs.lib; systems = [ @@ -42,7 +42,7 @@ rec { system = "x86_64-linux"; specialArgs = { - inherit unstable inputs; + inherit nixpkgs-unstable inputs; values = import ./values.nix; }; @@ -65,7 +65,7 @@ ); stableNixosConfig = nixosConfig nixpkgs; - unstableNixosConfig = nixosConfig unstable; + unstableNixosConfig = nixosConfig nixpkgs-unstable; in { bicep = stableNixosConfig "bicep" { modules = [ diff --git a/hosts/ildkule/services/metrics/prometheus/mysqld.nix b/hosts/ildkule/services/metrics/prometheus/mysqld.nix index 9dcc2e2..ac63672 100644 --- a/hosts/ildkule/services/metrics/prometheus/mysqld.nix +++ b/hosts/ildkule/services/metrics/prometheus/mysqld.nix @@ -1,4 +1,4 @@ -{ config, unstable, ... }: let +{ config, ... }: let cfg = config.services.prometheus; in { sops.secrets."config/mysqld_exporter" = { };