From a72fb745367ab580a88a85fc6336f70a31c4f82c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jan 2024 15:43:14 +0100 Subject: [PATCH] Downgrade flake and lock until mailserver updates --- flake.lock | 202 +++++++++++++---------------------------------------- flake.nix | 7 +- 2 files changed, 51 insertions(+), 158 deletions(-) diff --git a/flake.lock b/flake.lock index b38dab6..9770d24 100644 --- a/flake.lock +++ b/flake.lock @@ -67,24 +67,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -92,11 +74,11 @@ ] }, "locked": { - "lastModified": 1705660020, - "narHash": "sha256-1tOuNh+UbiZlaC8RrpQzzypgnLBC67eRlBunfkE4sbQ=", + "lastModified": 1704980804, + "narHash": "sha256-lPNNKdPqIYcjhhYIVwlajNt/HqVWbMOoSdNnwCvOP04=", "owner": "nix-community", "repo": "home-manager", - "rev": "2064348e555b6aa963da6372a8f14e6acb80a176", + "rev": "93e804e7f8a1eb88bde6117cd5046501e66aa4bd", "type": "github" }, "original": { @@ -112,11 +94,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1705667791, - "narHash": "sha256-J0JYfA6eFdHluLnROVDkrqbYacWcJXYKXeJAFayDiAE=", + "lastModified": 1704665257, + "narHash": "sha256-Cycz00I26e8QZ9sZtCz0uIz6Cad5ld3zM7N2I+5beqI=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "330b7a78fcba967f2273ae71fb3c4bfb03b5dd21", + "rev": "8951673c6c216ddd6bac3db3e88e3f2281b3511a", "type": "github" }, "original": { @@ -125,26 +107,6 @@ "type": "github" } }, - "linger": { - "inputs": { - "flake-utils": [ - "flake-utils" - ] - }, - "locked": { - "lastModified": 1670283645, - "narHash": "sha256-SuC/SuQ8RUaM6RthNAkNTSnlpRXJxEmuym2OyPLLpWk=", - "owner": "mindsbackyard", - "repo": "linger-flake", - "rev": "9f8632c0621dc562dd42e9eacfdb6dae82aebf8b", - "type": "github" - }, - "original": { - "owner": "mindsbackyard", - "repo": "linger-flake", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -169,11 +131,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705635624, - "narHash": "sha256-DU0schxQOtBNO1c9hUsgYl+QMOXQMfRT7Qw/mg+ayno=", + "lastModified": 1704842529, + "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4471857c0a4a8a0ffc7bdbeaf1b998746ce12a82", + "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", "type": "github" }, "original": { @@ -215,27 +177,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1705458851, - "narHash": "sha256-uQvEhiv33Zj/Pv364dTvnpPwFSptRZgVedDzoM+HqVg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8bf65f17d8070a0a490daf5f1c784b87ee73982c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1705033721, - "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "type": "github" }, "original": { @@ -245,13 +191,29 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1704722960, + "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { - "lastModified": 1705133751, - "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", "type": "github" }, "original": { @@ -263,11 +225,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1705496572, - "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", + "lastModified": 1704722960, + "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", + "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", "type": "github" }, "original": { @@ -294,11 +256,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1704842529, - "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", + "lastModified": 1704161960, + "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", + "rev": "63143ac2c9186be6d9da6035fa22620018c85932", "type": "github" }, "original": { @@ -308,66 +270,13 @@ "type": "github" } }, - "pihole": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "linger": [ - "linger" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1670284048, - "narHash": "sha256-lNyJ7vrDAdsPVcNBXqDUXseBBL9Kf2q64/A8ntEKXWI=", - "owner": "mindsbackyard", - "repo": "pihole-flake", - "rev": "9daaf65415ad6d3f5a8daa617d8737bc405f9dd8", - "type": "github" - }, - "original": { - "owner": "mindsbackyard", - "repo": "pihole-flake", - "type": "github" - } - }, - "plasma-manager": { - "inputs": { - "home-manager": [ - "home-manager" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1705257805, - "narHash": "sha256-hx88TjxRWR9hEYrePm2aR/rKAu4VFx4irgN7AofE0Wg=", - "owner": "pjones", - "repo": "plasma-manager", - "rev": "87ca0e29c6fccfb7f09be6ff137716db5a7c8d8f", - "type": "github" - }, - "original": { - "owner": "pjones", - "repo": "plasma-manager", - "type": "github" - } - }, "root": { "inputs": { "extest": "extest", - "flake-utils": "flake-utils", "home-manager": "home-manager", "jovian": "jovian", - "linger": "linger", "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable", - "pihole": "pihole", - "plasma-manager": "plasma-manager", + "nixpkgs-unstable": "nixpkgs-unstable", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix" } @@ -382,16 +291,16 @@ "utils": "utils" }, "locked": { - "lastModified": 1705361146, - "narHash": "sha256-oN6fJdswGueekl3VYLyP8GyZR76In8Au338JdNYX88Q=", - "owner": "dotlambda", + "lastModified": 1703666786, + "narHash": "sha256-SLPNpM/rI8XPyVJAxMYAe+n6NiYSpuXvdwPILHP4yZI=", + "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "c0c812117d67e346a94c3b546d04ab4820ed38d3", + "rev": "b5023b36a1f6628865cb42b4353bd2ddde0ea9f4", "type": "gitlab" }, "original": { - "owner": "dotlambda", - "ref": "sieve-fix", + "owner": "simple-nixos-mailserver", + "ref": "master", "repo": "nixos-mailserver", "type": "gitlab" } @@ -399,14 +308,14 @@ "sops-nix": { "inputs": { "nixpkgs": "nixpkgs_5", - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1705356877, - "narHash": "sha256-274jL1cH64DcXUXebVMZBRUsTs3FvFlPIPkCN/yhSnI=", + "lastModified": 1704908274, + "narHash": "sha256-74W9Yyomv3COGRmKi8zvyA5tL2KLiVkBeaYmYLjXyOw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "87755331580fdf23df7e39b46d63ac88236bf42c", + "rev": "c0b3a5af90fae3ba95645bbf85d2b64880addd76", "type": "github" }, "original": { @@ -415,21 +324,6 @@ "type": "github" } }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "utils": { "locked": { "lastModified": 1605370193, diff --git a/flake.nix b/flake.nix index 23dc586..3b565c4 100644 --- a/flake.nix +++ b/flake.nix @@ -5,14 +5,14 @@ # Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; - simple-nixos-mailserver.url = "gitlab:dotlambda/nixos-mailserver/sieve-fix"; + simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; flake-utils.url = "github:numtide/flake-utils"; plasma-manager.url = "github:pjones/plasma-manager"; plasma-manager.inputs.nixpkgs.follows = "nixpkgs"; plasma-manager.inputs.home-manager.follows = "home-manager"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; @@ -41,7 +41,6 @@ outputs = { self, nixpkgs, - nixpkgs-stable, home-manager, sops-nix, simple-nixos-mailserver, @@ -107,7 +106,7 @@ nixosConfigurations = { queen = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = {inherit inputs outputs nixpkgs-stable;}; + specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < ./nixos/hosts/queen/configuration.nix