From 661f81b3f9ad80a8917c60aa3a74176d786c091e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=E2=80=9CNiols=E2=80=9D=20Jeannerod?= Date: Mon, 11 Nov 2024 17:28:35 +0100 Subject: [PATCH] Cleanup dead code --- deploy.nix | 2 +- fediversity/mastodon.nix | 1 - fediversity/peertube.nix | 1 - flake.nix | 2 +- tests/mastodon-garage.nix | 5 ++++- tests/pixelfed-garage.nix | 4 +++- vm/peertube-vm.nix | 3 ++- vm/pixelfed-vm.nix | 2 +- 8 files changed, 12 insertions(+), 8 deletions(-) diff --git a/deploy.nix b/deploy.nix index f927baa..232b7e3 100644 --- a/deploy.nix +++ b/deploy.nix @@ -1,5 +1,5 @@ { writeShellApplication }: -name: config: +name: _config: writeShellApplication { name = "deploy"; text = '' diff --git a/fediversity/mastodon.nix b/fediversity/mastodon.nix index 8583c60..8b6e95b 100644 --- a/fediversity/mastodon.nix +++ b/fediversity/mastodon.nix @@ -8,7 +8,6 @@ in { config, lib, - pkgs, ... }: diff --git a/fediversity/peertube.nix b/fediversity/peertube.nix index 96e256c..4a4a07b 100644 --- a/fediversity/peertube.nix +++ b/fediversity/peertube.nix @@ -8,7 +8,6 @@ in { config, lib, - pkgs, ... }: diff --git a/flake.nix b/flake.nix index da8cdaa..67f7cf4 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,7 @@ pkgs = nixpkgs.legacyPackages.${system}; pkgsLatest = nixpkgs-latest.legacyPackages.${system}; bleedingFediverseOverlay = ( - self: super: { + _: _: { pixelfed = pkgsLatest.pixelfed.overrideAttrs (old: { src = pixelfed; patches = (old.patches or [ ]) ++ [ ./fediversity/pixelfed-group-permissions.patch ]; diff --git a/tests/mastodon-garage.nix b/tests/mastodon-garage.nix index b2e5574..75e269c 100644 --- a/tests/mastodon-garage.nix +++ b/tests/mastodon-garage.nix @@ -1,7 +1,10 @@ { pkgs, self }: let lib = pkgs.lib; - rebuildableTest = import ./rebuildableTest.nix pkgs; + + ## FIXME: this binding was not used, but maybe we want a side-effect or something? + # rebuildableTest = import ./rebuildableTest.nix pkgs; + seleniumScript = pkgs.writers.writePython3Bin "selenium-script" { diff --git a/tests/pixelfed-garage.nix b/tests/pixelfed-garage.nix index d4b13c5..746728b 100644 --- a/tests/pixelfed-garage.nix +++ b/tests/pixelfed-garage.nix @@ -1,7 +1,9 @@ { pkgs, self }: let lib = pkgs.lib; - rebuildableTest = import ./rebuildableTest.nix pkgs; + + ## FIXME: this binding was not used but maybe we want a side effect or something? + # rebuildableTest = import ./rebuildableTest.nix pkgs; email = "test@test.com"; password = "testtest"; diff --git a/vm/peertube-vm.nix b/vm/peertube-vm.nix index c8ff9b9..9ba7c00 100644 --- a/vm/peertube-vm.nix +++ b/vm/peertube-vm.nix @@ -1,4 +1,5 @@ -{ pkgs, modulesPath, ... }: +{ modulesPath, ... }: + { imports = [ (modulesPath + "/virtualisation/qemu-vm.nix") ]; diff --git a/vm/pixelfed-vm.nix b/vm/pixelfed-vm.nix index b3f6bb3..8ec156a 100644 --- a/vm/pixelfed-vm.nix +++ b/vm/pixelfed-vm.nix @@ -1,5 +1,4 @@ { - pkgs, lib, modulesPath, ... @@ -9,6 +8,7 @@ let inherit (lib) mkVMOverride; in + { imports = [ (modulesPath + "/virtualisation/qemu-vm.nix") ];