diff --git a/flake.lock b/flake.lock index 768b86f3..47ffa579 100644 --- a/flake.lock +++ b/flake.lock @@ -75,27 +75,6 @@ "url": "https://gitea.c3d2.de/astro/bevy-mandelbrot.git" } }, - "eris": { - "inputs": { - "nimble": "nimble", - "nixpkgs": [ - "nixos" - ] - }, - "locked": { - "lastModified": 1665504240, - "narHash": "sha256-QoFDSbV0CSnuc9MIia8xZeZoOvJRlbNnY34QADlfSh8=", - "ref": "refs/heads/trunk", - "rev": "e008c53ff09f695824c14feb479c573071125656", - "revCount": 32, - "type": "git", - "url": "https://codeberg.org/eris/nix-eris" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/eris/nix-eris" - } - }, "fenix": { "inputs": { "nixpkgs": [ @@ -356,26 +335,6 @@ "type": "github" } }, - "nimble": { - "inputs": { - "nixpkgs": [ - "eris", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1662949370, - "narHash": "sha256-tNGaNy/0iOS54wYK7g7AQIpArMg8XqCQsAisoZ7Dg4U=", - "owner": "nix-community", - "repo": "flake-nimble", - "rev": "54dd3e91c0b61ea63eb4065f95b97f3f0fc98b06", - "type": "github" - }, - "original": { - "id": "nimble", - "type": "indirect" - } - }, "nix": { "inputs": { "lowdown-src": "lowdown-src", @@ -632,7 +591,6 @@ "affection-src": "affection-src", "bevy-julia": "bevy-julia", "bevy-mandelbrot": "bevy-mandelbrot", - "eris": "eris", "fenix": "fenix", "flake-utils": "flake-utils", "harmonia": "harmonia", @@ -655,7 +613,6 @@ "sops-nix": "sops-nix", "spacemsg": "spacemsg", "sshlogd": "sshlogd", - "syndicate": "syndicate", "ticker": "ticker", "tigger": "tigger", "tracer": "tracer", @@ -808,29 +765,6 @@ "url": "https://gitea.c3d2.de/astro/sshlogd.git" } }, - "syndicate": { - "inputs": { - "nixpkgs": [ - "nixos" - ], - "rust": [ - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1666293786, - "narHash": "sha256-IdktXkUxLBfOcAjD9ppOwx3CisCPaR2ZgK01K3j06JI=", - "ref": "refs/heads/trunk", - "rev": "1ce5f34e218195c1ecad0d238a892862af573ae7", - "revCount": 55, - "type": "git", - "url": "https://git.syndicate-lang.org/ehmry/syndicate-flake" - }, - "original": { - "type": "git", - "url": "https://git.syndicate-lang.org/ehmry/syndicate-flake" - } - }, "ticker": { "inputs": { "fenix": [ diff --git a/flake.nix b/flake.nix index 0013de97..ddefee79 100644 --- a/flake.nix +++ b/flake.nix @@ -35,10 +35,10 @@ rust-overlay.follows = "rust-overlay"; }; }; - eris = { - url = "git+https://codeberg.org/eris/nix-eris"; - inputs.nixpkgs.follows = "nixos"; - }; + # eris = { + # url = "git+https://codeberg.org/eris/nix-eris?ref=trunk"; + # inputs.nixpkgs.follows = "nixos"; + # }; fenix = { url = "github:nix-community/fenix"; inputs.nixpkgs.follows = "nixos"; @@ -123,13 +123,13 @@ url = "github:astro/spacemsg"; flake = false; }; - syndicate = { - url = "git+https://git.syndicate-lang.org/ehmry/syndicate-flake"; - inputs = { - nixpkgs.follows = "nixos"; - rust.follows = "rust-overlay"; - }; - }; + # syndicate = { + # url = "git+https://git.syndicate-lang.org/ehmry/syndicate-flake"; + # inputs = { + # nixpkgs.follows = "nixos"; + # rust.follows = "rust-overlay"; + # }; + # }; ticker = { url = "git+https://gitea.c3d2.de/astro/ticker.git"; inputs = { @@ -167,7 +167,7 @@ }; }; - outputs = inputs@{ self, eris, fenix, harmonia, heliwatch, microvm, naersk, nixos, nixos-hardware, nixos-unstable, oparl-scraper, scrapers, secrets, sshlogd, sops-nix, spacemsg, syndicate, ticker, tigger, yammat, zentralwerk, ... }: + outputs = inputs@{ self, fenix, harmonia, heliwatch, microvm, naersk, nixos, nixos-hardware, nixos-unstable, oparl-scraper, scrapers, secrets, sshlogd, sops-nix, spacemsg, ticker, tigger, yammat, zentralwerk, ... }: let inherit (nixos) lib; forAllSystems = lib.genAttrs [ "aarch64-linux" "x86_64-linux" ]; @@ -220,9 +220,9 @@ pkgs.appendOverlays [ fenix.overlay naersk.overlay - syndicate.overlays.default - eris.inputs.nimble.overlay - eris.overlays.default + # syndicate.overlays.default + # eris.inputs.nimble.overlay + # eris.overlays.default self.overlay ]) nixos.legacyPackages; @@ -618,21 +618,21 @@ system = "aarch64-linux"; }; - nncp = nixosSystem' { - modules = [ - self.nixosModules.microvm - self.nixosModules.nncp - syndicate.nixosModules.default - ./hosts/nncp - { - nixpkgs.overlays = [ - syndicate.overlays.default - eris.inputs.nimble.overlay - eris.overlays.default - ]; - } - ]; - }; + # nncp = nixosSystem' { + # modules = [ + # self.nixosModules.microvm + # self.nixosModules.nncp + # syndicate.nixosModules.default + # ./hosts/nncp + # { + # nixpkgs.overlays = [ + # syndicate.overlays.default + # eris.inputs.nimble.overlay + # eris.overlays.default + # ]; + # } + # ]; + # }; dacbert = nixosSystem' { modules = [