pkgs/tools/admin: remove dead code

with the help of deadnix & nil
This commit is contained in:
figsoda 2023-07-25 09:54:32 -04:00
parent adcbabfac2
commit fdd31f980e
14 changed files with 17 additions and 21 deletions

View File

@ -8,7 +8,7 @@
let let
py = python3.override { py = python3.override {
packageOverrides = self: super: { packageOverrides = self: super: {
pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { pyyaml = super.pyyaml.overridePythonAttrs rec {
version = "5.4.1"; version = "5.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yaml"; owner = "yaml";
@ -21,7 +21,7 @@ let
PYTHONPATH="tests/lib3:$PYTHONPATH" ${self.python.interpreter} -m test_all PYTHONPATH="tests/lib3:$PYTHONPATH" ${self.python.interpreter} -m test_all
runHook postCheck runHook postCheck
''; '';
}); };
}; };
self = py; self = py;
}; };

View File

@ -14,7 +14,7 @@ let
# put packages that needs to be overridden in the py package scope # put packages that needs to be overridden in the py package scope
py = import ./python-packages.nix { py = import ./python-packages.nix {
inherit stdenv lib src version python3 fetchPypi; inherit stdenv src version python3 fetchPypi;
}; };
in in
py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {

View File

@ -1,4 +1,4 @@
{ stdenv, python3, fetchPypi, lib, src, version }: { stdenv, python3, fetchPypi, src, version }:
let let
buildAzureCliPackage = with py.pkgs; buildPythonPackage; buildAzureCliPackage = with py.pkgs; buildPythonPackage;

View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: { lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec { buildGoModule rec {
pname = "credhub-cli"; pname = "credhub-cli";

View File

@ -1,4 +1,4 @@
{ buildGoModule, fetchFromGitHub, lib, stdenv }: { lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec { buildGoModule rec {
pname = "cw"; pname = "cw";

View File

@ -3,7 +3,7 @@
let let
python = python3.override { python = python3.override {
packageOverrides = self: super: { packageOverrides = self: super: {
pyparsing = super.pyparsing.overridePythonAttrs (oldAttrs: rec { pyparsing = super.pyparsing.overridePythonAttrs rec {
version = "2.4.7"; version = "2.4.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pyparsing"; owner = "pyparsing";
@ -14,7 +14,7 @@ let
nativeBuildInputs = [ nativeBuildInputs = [
super.setuptools super.setuptools
]; ];
}); };
}; };
}; };
in in

View File

@ -1,12 +1,10 @@
{ stdenv { lib
, lib , stdenv
, google-cloud-sdk
, system , system
, snapshotPath , snapshotPath
, autoPatchelfHook , autoPatchelfHook
, python3 , python3
, libxcrypt-legacy , libxcrypt-legacy
, ...
}: }:
let let
@ -143,7 +141,7 @@ let
{ {
url = src; url = src;
inherit sha256; inherit sha256;
}) ; });
dontUnpack = true; dontUnpack = true;
installPhase = '' installPhase = ''
mkdir -p $out/google-cloud-sdk/.install mkdir -p $out/google-cloud-sdk/.install

View File

@ -7,7 +7,7 @@
# 3) used by `google-cloud-sdk` only on GCE guests # 3) used by `google-cloud-sdk` only on GCE guests
# #
{ stdenv, lib, fetchurl, makeWrapper, nixosTests, python, openssl, jq, callPackage, with-gce ? false }: { stdenv, lib, fetchurl, makeWrapper, python, openssl, jq, callPackage, with-gce ? false }:
let let
pythonEnv = python.withPackages (p: with p; [ pythonEnv = python.withPackages (p: with p; [

View File

@ -1,4 +1,4 @@
{ lib, google-cloud-sdk, callPackage, runCommand, components }: { lib, google-cloud-sdk, runCommand, components }:
comps_: comps_:

View File

@ -1,7 +1,6 @@
{ stdenv { lib
, buildGoModule , buildGoModule
, fetchFromGitHub , fetchFromGitHub
, lib
, testers , testers
, kics , kics
}: }:

View File

@ -1,4 +1,4 @@
{ lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs_18, jq, dos2unix }: { lib, fetchzip, yarn2nix-moretea, nodejs_18, dos2unix }:
yarn2nix-moretea.mkYarnPackage { yarn2nix-moretea.mkYarnPackage {
version = "1.1.6"; version = "1.1.6";

View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: { lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec { buildGoModule rec {
version = "1.7.16"; version = "1.7.16";

View File

@ -1,4 +1,4 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: { lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec { buildGoModule rec {
pname = "syft"; pname = "syft";

View File

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, xorg , xorg
, xkeyboard_config , xkeyboard_config
, zlib , zlib