Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): routine update #116

Merged
merged 7 commits into from
Dec 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion files/.local/opt/tldr
Submodule tldr updated 258 files
3 changes: 2 additions & 1 deletion files/.local/share/zsh/site-functions/bd
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,5 @@ if (( count > 0 )); then
return 1
fi

cd "$destination"
builtin cd -- "$destination"
printf '%s\n' "$PWD"
2 changes: 1 addition & 1 deletion files/.local/share/zsh/site-functions/fzf-cd-repo-widget
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ fzf-cd-repo-widget() {
fi

zle push-line
BUFFER="cd ${(q)dir}"
BUFFER="builtin cd -- ${(q)dir}"
zle accept-line
local ret=$?

Expand Down
2 changes: 1 addition & 1 deletion files/.local/share/zsh/site-functions/fzf-cdr-widget
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fzf-cdr-widget() {
fi

zle push-line
BUFFER="cd ${(q)dir}"
BUFFER="builtin cd -- ${(q)dir}"
zle accept-line
local ret=$?

Expand Down
24 changes: 12 additions & 12 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 28 additions & 13 deletions nix/apps/update.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,14 @@
{ lib
, path
, coreutils
, curl
, gawk
, git
, gnused
, jq
, nix
, python3
, runtimeShellPackage
, writers

, packages
Expand All @@ -42,8 +47,8 @@ let
})
packages;

packagesWithUpdateScript =
lib.filter (p: lib.hasAttr "updateScript" p.package) packageList;
checkEligibility = p: lib.hasAttr "updateScript" p.package;
updatables = lib.filter checkEligibility packageList;

somewhatUniqueRepresentant = p: {
inherit (p.package) updateScript;
Expand All @@ -67,7 +72,7 @@ let
in
[ x ] ++ nubOn f xs;

uniquePackages = nubOn somewhatUniqueRepresentant packagesWithUpdateScript;
uniqueUpdatables = nubOn somewhatUniqueRepresentant updatables;

# Transform a matched package into an object for update.py.
#
Expand All @@ -84,13 +89,25 @@ let
# JSON file with data for update.py.
#
packagesJson =
writers.writeJSON "packages.json" (map packageData uniquePackages);

optionalArgs =
lib.optional (max-workers != null) "--max-workers=${max-workers}";

args = [ packagesJson ] ++ optionalArgs;
binPath = lib.makeBinPath [ coreutils git nix ];
writers.writeJSON "packages.json" (map packageData uniqueUpdatables);

updaterArgs = [
python3.interpreter
"${path}/maintainers/scripts/update.py"
packagesJson
]
++ lib.optional (max-workers != null) "--max-workers=${max-workers}";

binPath = lib.makeBinPath [
coreutils
curl
gawk
git
gnused
jq
nix
runtimeShellPackage
];
in
writers.writeBash "update.sh" ''
set -euo pipefail
Expand All @@ -113,9 +130,7 @@ writers.writeBash "update.sh" ''
fi

printf 'Updating packages...\n'
${lib.escapeShellArgs [
python3.interpreter "${path}/maintainers/scripts/update.py" args
]} <<<$'\n'
${lib.escapeShellArgs updaterArgs} <<<$'\n'

if [[ -n "$PACKAGES_ONLY" ]]; then
exit
Expand Down
2 changes: 1 addition & 1 deletion nix/nixos/profiles/desktop.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ in

fonts = {
fontDir.enable = true;
fonts = with pkgs; [
packages = with pkgs; [
noto-fonts
noto-fonts-cjk-sans
noto-fonts-cjk-serif
Expand Down
3 changes: 0 additions & 3 deletions nix/packages/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ $ nix search
* packages.x86_64-linux.bpftrace (0.13.0)
High-level tracing language for Linux eBPF

* packages.x86_64-linux.cloudfoundry-cli-6 (6-v6.53.0)
The official command line client for Cloud Foundry

* packages.x86_64-linux.neovim (0.7.0)
Vim text editor fork focused on extensibility and agility

Expand Down
72 changes: 0 additions & 72 deletions nix/packages/cloudfoundry-cli/bump-go-loggregator.patch

This file was deleted.

94 changes: 0 additions & 94 deletions nix/packages/cloudfoundry-cli/default.nix

This file was deleted.

Loading