chore: cleanup unused packages on Darwin
This commit is contained in:
@@ -22,11 +22,11 @@
|
|||||||
home-manager
|
home-manager
|
||||||
python3Packages.ipython
|
python3Packages.ipython
|
||||||
just
|
just
|
||||||
|
glab
|
||||||
go
|
go
|
||||||
gopls
|
gopls
|
||||||
mariadb
|
mariadb
|
||||||
nixVersions.stable
|
nixVersions.stable
|
||||||
pipenv-ivr
|
|
||||||
pre-commit
|
pre-commit
|
||||||
python311
|
python311
|
||||||
python3Packages.flake8
|
python3Packages.flake8
|
||||||
|
|||||||
@@ -158,6 +158,8 @@ in
|
|||||||
"https://thehellings.com"
|
"https://thehellings.com"
|
||||||
else
|
else
|
||||||
"https://kuma.shire-zebra.ts.net/";
|
"https://kuma.shire-zebra.ts.net/";
|
||||||
|
"devtools.debugger.remote-enabled" = true;
|
||||||
|
"devtools.debugger.remote-port" = 9222;
|
||||||
"doh-rollout.doorhanger-decision" = "UIDisabled";
|
"doh-rollout.doorhanger-decision" = "UIDisabled";
|
||||||
"doh-rollout.doneFirstRun" = true;
|
"doh-rollout.doneFirstRun" = true;
|
||||||
"signon.rememberSignons" = false;
|
"signon.rememberSignons" = false;
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ final: prev:
|
|||||||
in
|
in
|
||||||
{
|
{
|
||||||
daikinone = cp ./daikinone.nix { };
|
daikinone = cp ./daikinone.nix { };
|
||||||
xonsh-apipenv = cp ./xonsh-apipenv.nix { };
|
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
];
|
];
|
||||||
@@ -25,7 +24,6 @@ final: prev:
|
|||||||
withBDplus = true;
|
withBDplus = true;
|
||||||
};
|
};
|
||||||
handbrake = prev.handbrake.override { libbluray = final.libbluray-custom; };
|
handbrake = prev.handbrake.override { libbluray = final.libbluray-custom; };
|
||||||
pipenv-ivr = prev.callPackage ./pipenv.nix { };
|
|
||||||
OVMFFull = prev.OVMFFull.override {
|
OVMFFull = prev.OVMFFull.override {
|
||||||
secureBoot = true;
|
secureBoot = true;
|
||||||
msVarsTemplate = true;
|
msVarsTemplate = true;
|
||||||
|
|||||||
@@ -1,92 +0,0 @@
|
|||||||
{
|
|
||||||
lib,
|
|
||||||
stdenv,
|
|
||||||
python3,
|
|
||||||
fetchFromGitHub,
|
|
||||||
installShellFiles,
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
|
|
||||||
runtimeDeps =
|
|
||||||
ps:
|
|
||||||
with ps;
|
|
||||||
[
|
|
||||||
certifi
|
|
||||||
pysocks
|
|
||||||
setuptools
|
|
||||||
(pip.overridePythonAttrs {
|
|
||||||
dependencies = [ ps.pysocks ];
|
|
||||||
})
|
|
||||||
virtualenv
|
|
||||||
virtualenv-clone
|
|
||||||
]
|
|
||||||
++ lib.optionals stdenv.hostPlatform.isAndroid [ pyjnius ];
|
|
||||||
|
|
||||||
pythonEnv = python3.withPackages runtimeDeps;
|
|
||||||
|
|
||||||
in
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
|
||||||
pname = "pipenv";
|
|
||||||
version = "2023.11.15";
|
|
||||||
format = "pyproject";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "pypa";
|
|
||||||
repo = "pipenv";
|
|
||||||
rev = "refs/tags/v${version}";
|
|
||||||
hash = "sha256-kxwyws22xJkqBy/hXXcAPHZR2NgZHbmwZr9vYqce434=";
|
|
||||||
};
|
|
||||||
|
|
||||||
env.LC_ALL = "en_US.UTF-8";
|
|
||||||
|
|
||||||
nativeBuildInputs = with python3.pkgs; [
|
|
||||||
installShellFiles
|
|
||||||
setuptools
|
|
||||||
wheel
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
# pipenv invokes python in a subprocess to create a virtualenv
|
|
||||||
# and to call setup.py.
|
|
||||||
# It would use sys.executable, which in our case points to a python that
|
|
||||||
# does not have the required dependencies.
|
|
||||||
substituteInPlace pipenv/utils/virtualenv.py \
|
|
||||||
--replace "sys.executable" "'${pythonEnv.interpreter}'"
|
|
||||||
'';
|
|
||||||
|
|
||||||
propagatedBuildInputs = runtimeDeps python3.pkgs;
|
|
||||||
|
|
||||||
preCheck = ''
|
|
||||||
export HOME="$TMPDIR"
|
|
||||||
'';
|
|
||||||
|
|
||||||
nativeCheckInputs = with python3.pkgs; [
|
|
||||||
mock
|
|
||||||
pytestCheckHook
|
|
||||||
pytest-xdist
|
|
||||||
pytz
|
|
||||||
requests
|
|
||||||
];
|
|
||||||
|
|
||||||
disabledTests = [
|
|
||||||
"test_convert_deps_to_pip"
|
|
||||||
"test_download_file"
|
|
||||||
];
|
|
||||||
|
|
||||||
disabledTestPaths = [ "tests/integration" ];
|
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
installShellCompletion --cmd pipenv \
|
|
||||||
--bash <(_PIPENV_COMPLETE=bash_source $out/bin/pipenv) \
|
|
||||||
--zsh <(_PIPENV_COMPLETE=zsh_source $out/bin/pipenv) \
|
|
||||||
--fish <(_PIPENV_COMPLETE=fish_source $out/bin/pipenv)
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Python Development Workflow for Humans";
|
|
||||||
license = licenses.mit;
|
|
||||||
platforms = platforms.all;
|
|
||||||
maintainers = with maintainers; [ berdario ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
{
|
|
||||||
lib,
|
|
||||||
buildPythonPackage,
|
|
||||||
fetchFromGitHub,
|
|
||||||
toPythonModule,
|
|
||||||
pipenv,
|
|
||||||
setuptools,
|
|
||||||
}:
|
|
||||||
|
|
||||||
buildPythonPackage rec {
|
|
||||||
pname = "xonsh-apipenv";
|
|
||||||
version = "0.6.0";
|
|
||||||
pyproject = true;
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "greg-hellings";
|
|
||||||
repo = "xontrib-apipenv";
|
|
||||||
rev = version;
|
|
||||||
hash = "sha256-Wa8iev0ow1oh95tPCv5tAJUMBYiStWms8I31WbVcOok=";
|
|
||||||
};
|
|
||||||
|
|
||||||
dependencies = [ (toPythonModule pipenv) ];
|
|
||||||
build-system = [ setuptools ];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Auto pipenv support for Xonsh";
|
|
||||||
homepage = "https://github.com/greg-hellings/xontrib-apipenv";
|
|
||||||
license = licenses.mit;
|
|
||||||
maintainers = [ ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -2,14 +2,12 @@
|
|||||||
writeShellApplication,
|
writeShellApplication,
|
||||||
curl,
|
curl,
|
||||||
gnused,
|
gnused,
|
||||||
systemd,
|
|
||||||
}:
|
}:
|
||||||
writeShellApplication {
|
writeShellApplication {
|
||||||
name = "adblock-update";
|
name = "adblock-update";
|
||||||
runtimeInputs = [
|
runtimeInputs = [
|
||||||
curl
|
curl
|
||||||
gnused
|
gnused
|
||||||
systemd
|
|
||||||
];
|
];
|
||||||
text = ''
|
text = ''
|
||||||
curl -s https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts | sed '1,33d' > /etc/adblock_hosts
|
curl -s https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts | sed '1,33d' > /etc/adblock_hosts
|
||||||
@@ -19,7 +17,5 @@ writeShellApplication {
|
|||||||
for f in "segment.com" "segment.io" "branch.io" "dev.visualwebsiteoptimizer.com" "click.discord.com"; do
|
for f in "segment.com" "segment.io" "branch.io" "dev.visualwebsiteoptimizer.com" "click.discord.com"; do
|
||||||
sed -i -e "/''${f}/d" /etc/adblock_hosts # Blocks Trelly content for house investors
|
sed -i -e "/''${f}/d" /etc/adblock_hosts # Blocks Trelly content for house investors
|
||||||
done
|
done
|
||||||
|
|
||||||
systemctl restart dnsmasq
|
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user