remove dead code (run deadnix)

2024-06-29 22:59:27 +01:00
parent 16a2499d74
commit e94bf62ec1
112 changed files with 83 additions and 246 deletions
--- a/pkgs/devout/default.nix
+++ b/pkgs/devout/default.nix
@@ -1,6 +1,4 @@
-{
-  lua
-, nellie
+{ nellie
 , writeFennel
 , anoia
 , fennel
--- a/pkgs/fennelrepl/default.nix
+++ b/pkgs/fennelrepl/default.nix
@@ -1,9 +1,4 @@
-{
-  runCommand
-, runtimeShell
-, fetchurl
-, lib
-, luaPackages
+{ lib
 , lua
 , lualinux
 , writeScriptBin
--- a/pkgs/firewallgen/default.nix
+++ b/pkgs/firewallgen/default.nix
@@ -7,8 +7,8 @@ name : ruleset :
 let
  inherit (lib.strings) concatStringsSep splitString hasInfix substring;
  inherit (lib.lists) groupBy;
-  inherit (lib.attrsets) mapAttrsToList nameValuePair;
-  inherit (builtins) map listToAttrs replaceStrings head tail;
+  inherit (lib.attrsets) mapAttrsToList;
+  inherit (builtins) map head tail;

  indentLines = offset : lines :
    if lines == []
@@ -31,7 +31,7 @@ let

  indent = text : indentLines 0 (splitString "\n" text);

-  dochain = { name, type, family, rules,
+  dochain = { name, type, rules,
              policy ? null,
              priority ? "filter",
              hook ? null } : ''
--- a/pkgs/ifwait/default.nix
+++ b/pkgs/ifwait/default.nix
@@ -1,6 +1,4 @@
-{
-  lua
-, netlink-lua
+{ netlink-lua
 , writeFennelScript
 , runCommand
 , anoia
--- a/pkgs/kernel-backport/default.nix
+++ b/pkgs/kernel-backport/default.nix
@@ -3,9 +3,7 @@
 , python2
 , which
 , fetchgit
-, fetchpatch
 , fetchFromGitHub
-, autoreconfHook
 , coccinelle
 }:
 let
--- a/pkgs/kernel/default.nix
+++ b/pkgs/kernel/default.nix
@@ -1,6 +1,5 @@
 {  stdenv
 , buildPackages
- , runCommand
 , writeText
 , lib

--- a/pkgs/liminix-tools/builders/squashfs.nix
+++ b/pkgs/liminix-tools/builders/squashfs.nix
@@ -1,7 +1,4 @@
-{
-  stdenv
-, busybox
-, buildPackages
+{ buildPackages
 , callPackage
 , pseudofile
 , runCommand
--- a/pkgs/liminix-tools/services/default.nix
+++ b/pkgs/liminix-tools/services/default.nix
@@ -1,14 +1,11 @@
 {
  stdenvNoCC
-, s6-rc
 , s6
 , lib
-, callPackage
 , writeScript
 , serviceFns
 }:
 let
-  inherit (builtins) concatStringsSep any map;
  prefix = "/run/services/outputs";
  output = service: name: "${prefix}/${service.name}/${name}";
  serviceScript = commands : ''
@@ -28,7 +25,6 @@ let
    , up ? null
    , down ? null
    , finish ? null
-    , outputs ? []
    , notification-fd ? null
    , producer-for ? null
    , consumer-for ? null
@@ -40,7 +36,7 @@ let
    , buildInputs ? []
    , restart-on-upgrade ? false
    , controller ? null
-  } @ args:
+  }:
    stdenvNoCC.mkDerivation {
      # we use stdenvNoCC to avoid generating derivations with names
      # like foo.service-mips-linux-musl
@@ -55,9 +51,7 @@ let
  longrun = {
    name
    , run
-    , outputs ? []
    , notification-fd ? null
-    , dependencies ? []
    , buildInputs ? []
    , ...
  } @ args:
@@ -81,8 +75,6 @@ let
    name
    , up
    , down ? ""
-    , outputs ? []
-    , dependencies ? []
    , ...
  } @ args : service (args  // {
    serviceType = "oneshot";
@@ -91,9 +83,7 @@ let
      "${name}-down"
      "${serviceScript down}\n${cleanupScript name}";
  });
-  bundle = {
-    name
-    , contents ? []
+  bundle = { contents ? []
    , dependencies ? []
    , ...
  } @ args: service (args // {
--- a/pkgs/linotify/default.nix
+++ b/pkgs/linotify/default.nix
@@ -1,4 +1,4 @@
-{ lua, lib, fetchFromGitHub }:
+{ lua, fetchFromGitHub }:
 let pname = "linotify";
 in lua.pkgs.buildLuaPackage {
  inherit pname;
--- a/pkgs/lualinux/default.nix
+++ b/pkgs/lualinux/default.nix
@@ -1,4 +1,4 @@
-{ lua, lib, fetchFromGitHub }:
+{ lua, fetchFromGitHub }:
 let
  pname = "lualinux";
  src = fetchFromGitHub {
--- a/pkgs/mac80211/default.nix
+++ b/pkgs/mac80211/default.nix
@@ -22,7 +22,7 @@ let
    rev = "a5265497a4f6da158e95d6a450cb2cb6dc085cab";
    hash = "sha256-YYi4gkpLjbOK7bM2MGQjAyEBuXJ9JNXoz/JEmYf8xE8=";
  };
-  inherit (liminix.services) oneshot longrun;
+  inherit (liminix.services) oneshot;
  inherit (lib.lists) foldl;
  configs = {
    ath9k.kconfig = {
--- a/pkgs/min-collect-garbage/default.nix
+++ b/pkgs/min-collect-garbage/default.nix
@@ -1,12 +1,8 @@
 {
  stdenv
-, nix
-, cpio
-, openssh
 }: stdenv.mkDerivation {
  name = "min-collect-garbage";
  buildInputs = [ ];
-#  propagatedBuildInputs = [ openssh ];
  src = ./.;
  makeFlags = [ "min-list-garbage" ];
  installPhase = ''
--- a/pkgs/minisock/default.nix
+++ b/pkgs/minisock/default.nix
@@ -1,4 +1,4 @@
-{ lua, lib, fetchFromGitHub }:
+{ lua, fetchFromGitHub }:
 let
  pname = "minisock";
  src = fetchFromGitHub {
--- a/pkgs/nellie/default.nix
+++ b/pkgs/nellie/default.nix
@@ -1,4 +1,4 @@
-{ lua, lib, fetchpatch, fetchFromGitHub, stdenv }:
+{ lua, stdenv }:

 let pname = "nellie";
 in lua.pkgs.buildLuaPackage {
--- a/pkgs/netlink-lua/default.nix
+++ b/pkgs/netlink-lua/default.nix
@@ -1,4 +1,4 @@
-{ lua, lib, fetchpatch, fetchFromGitHub, libmnl }:
+{ lua, fetchFromGitHub, libmnl }:
 let pname = "netlink";
 in lua.pkgs.buildLuaPackage {
  inherit pname;
--- a/pkgs/odhcp-script/default.nix
+++ b/pkgs/odhcp-script/default.nix
@@ -1,7 +1,6 @@
 {
  writeFennelScript
 , anoia
-, lua
 , lualinux
 }:
 writeFennelScript  "odhcpc-script" [anoia lualinux] ./odhcp6-script.fnl
--- a/pkgs/odhcp6c/default.nix
+++ b/pkgs/odhcp6c/default.nix
@@ -1,5 +1,4 @@
 { stdenv
-, buildPackages
 , cmake
 , fetchFromGitHub
 , ...} :
--- a/pkgs/openwrt/default.nix
+++ b/pkgs/openwrt/default.nix
@@ -1,6 +1,5 @@
 {
  fetchFromGitHub
-, writeShellScript
 , pkgsBuildBuild
 }:
 let
--- a/pkgs/pppoe/default.nix
+++ b/pkgs/pppoe/default.nix
@@ -2,8 +2,6 @@
 , stdenv
 , fetchFromGitHub
 , ppp } :
-let
-in
 stdenv.mkDerivation rec {
  pname = "rp-pppoe";
  version = "3.15";
--- a/pkgs/preinit/default.nix
+++ b/pkgs/preinit/default.nix
@@ -1,14 +1,7 @@
 {
  stdenv
-, fetchzip
 , gdb
 }:
-let kernel = fetchzip {
-      name = "linux";
-      url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.71.tar.gz";
-      hash = "sha256-pq6QNa0PJVeheaZkuvAPD0rLuEeKrViKk65dz+y4kqo=";
-    };
-in
 stdenv.mkDerivation {
  name = "preinit";
  src = ./.;
--- a/pkgs/tufted/default.nix
+++ b/pkgs/tufted/default.nix
@@ -1,7 +1,6 @@
 {
  lua5_3
 , stdenv
-, fetchFromGitHub
 , makeWrapper
 } :
 let
--- a/pkgs/uevent-watch/default.nix
+++ b/pkgs/uevent-watch/default.nix
@@ -1,9 +1,6 @@
-{
-  lua
-, nellie
+{ nellie
 , lualinux
 , writeFennel
-, runCommand
 , anoia
 , fennel
 , stdenv
--- a/pkgs/write-fennel-script/default.nix
+++ b/pkgs/write-fennel-script/default.nix
@@ -1,8 +1,4 @@
-{
-  lua
-, lib
-, fennel
-, writeFennel
+{ writeFennel
 , stdenv
 }:
 name : packages : source :
--- a/pkgs/write-fennel/default.nix
+++ b/pkgs/write-fennel/default.nix
@@ -9,7 +9,7 @@ name :
  packages ? [],
  correlate ? false,
  mainFunction ? null
-} @ options : source :
+} : source :
  let
    luapath = builtins.map
      (f: