diff --git a/services/deploy.nix b/services/deploy.nix index f927baae..232b7e34 100644 --- a/services/deploy.nix +++ b/services/deploy.nix @@ -1,5 +1,5 @@ { writeShellApplication }: -name: config: +name: _config: writeShellApplication { name = "deploy"; text = '' diff --git a/services/fediversity/mastodon.nix b/services/fediversity/mastodon.nix index 8583c60c..8b6e95bc 100644 --- a/services/fediversity/mastodon.nix +++ b/services/fediversity/mastodon.nix @@ -8,7 +8,6 @@ in { config, lib, - pkgs, ... }: diff --git a/services/fediversity/peertube.nix b/services/fediversity/peertube.nix index 96e256cf..4a4a07b2 100644 --- a/services/fediversity/peertube.nix +++ b/services/fediversity/peertube.nix @@ -8,7 +8,6 @@ in { config, lib, - pkgs, ... }: diff --git a/services/flake.nix b/services/flake.nix index da8cdaaf..67f7cf4f 100644 --- a/services/flake.nix +++ b/services/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/services/tests/mastodon-garage.nix b/services/tests/mastodon-garage.nix index b2e55743..75e269c3 100644 --- a/services/tests/mastodon-garage.nix +++ b/services/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/services/tests/pixelfed-garage.nix b/services/tests/pixelfed-garage.nix index d4b13c5f..746728bd 100644 --- a/services/tests/pixelfed-garage.nix +++ b/services/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/services/vm/peertube-vm.nix b/services/vm/peertube-vm.nix index c8ff9b93..9ba7c008 100644 --- a/services/vm/peertube-vm.nix +++ b/services/vm/peertube-vm.nix @@ -1,4 +1,5 @@ -{ pkgs, modulesPath, ... }: +{ modulesPath, ... }: + { imports = [ (modulesPath + "/virtualisation/qemu-vm.nix") ]; diff --git a/services/vm/pixelfed-vm.nix b/services/vm/pixelfed-vm.nix index b3f6bb3c..8ec156a7 100644 --- a/services/vm/pixelfed-vm.nix +++ b/services/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") ];