summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Idziorek <m.i@gmx.at>2022-07-23 10:55:33 +0200
committerMichal Idziorek <m.i@gmx.at>2022-07-23 10:55:33 +0200
commite98f051c034f907ec88c4dfb9757fced9f3bd76e (patch)
treee657bdf215a146a645e47c0bdcac3e8e0ff1b4eb
parentc44966d91f83734e29e6d13c93f62999621cced7 (diff)
bump comet to nixos-22.05HEADmaster
-rw-r--r--nix/nixops/comet/configuration.nix2
-rw-r--r--nix/shell.nix22
2 files changed, 3 insertions, 21 deletions
diff --git a/nix/nixops/comet/configuration.nix b/nix/nixops/comet/configuration.nix
index 7fc401d..4d9d625 100644
--- a/nix/nixops/comet/configuration.nix
+++ b/nix/nixops/comet/configuration.nix
@@ -145,7 +145,7 @@ in
# MARIADB
services.mysql.enable = true;
services.mysql.package = pkgs.mariadb;
- services.mysql.bind = "0.0.0.0";
+ services.mysql.settings.mysqld.bind-address = "0.0.0.0";
# AQUARIUS REV PROXY
services.nginx.virtualHosts."aquarius.softwarefools.com" = {
diff --git a/nix/shell.nix b/nix/shell.nix
index 0bda684..899409c 100644
--- a/nix/shell.nix
+++ b/nix/shell.nix
@@ -1,23 +1,5 @@
{ pkgs ? import <nixpkgs> {} }:
-/* https://githubhot.com/repo/NixOS/nixops/issues/1490?page=2 */
with pkgs;
-let packs = [
- (pkgs.nixopsUnstable.override {
- ## https://github.com/NixOS/nixops/issues/1490
- overrides = (self: super: {
- nixops = super.nixops.overridePythonAttrs (
- _: {
- src = pkgs.fetchgit {
- url = "https://github.com/nixos/nixops";
- rev = "35ac02085169bc2372834d6be6cf4c1bdf820d09";
- sha256 = "1jh0jrxyywjqhac2dvpj7r7isjv68ynbg7g6f6rj55raxcqc7r3j";
- };
- }
- );
- });
- })
- ];
-in mkShell {
- # nativeBuildInputs is usually what you want -- tools you need to run
- nativeBuildInputs = packs; /* -- [ nixopsUnstable nixos-generators ] */
+mkShell {
+ nativeBuildInputs = [ nixopsUnstable ];
}