Skip to content

Commit

Permalink
update versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@hhoeflin
hhoeflin committed Feb 6, 2024
1 parent 2755ebc commit 051adb5
Show file tree
Hide file tree
Showing 28 changed files with 80 additions and 55 deletions.
8 changes: 7 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ docker: docker/Dockerfile_ubuntu

include makefiles/lmod/setup_lmod.mk

docker/Dockerfile_ubuntu: makefiles/Makefile docker/Dockerfile_head_ubuntu docker/create_dockerfile.py
docker/conda_env: docker/conda_env.yaml
${INIT_LMOD}
ml home/mambaforge
mamba env create -f docker/conda_env.yaml -p docker/conda_env
mamba deactivate

docker/Dockerfile_ubuntu: makefiles/Makefile docker/Dockerfile_head_ubuntu docker/create_dockerfile.py docker/conda_env
${INIT_LMOD}
ml home/mambaforge
mamba activate docker/conda_env
Expand Down
49 changes: 30 additions & 19 deletions docker/Dockerfile_ubuntu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,49 +86,60 @@ RUN make -C libgit2 all
COPY --chown=docker:docker makefiles/exa/Makefile makefiles/exa/module_template /home/docker/makefiles/exa/
RUN make -C exa all

COPY --chown=docker:docker makefiles/eza/Makefile makefiles/eza/module_template /home/docker/makefiles/eza/
RUN make -C eza all

COPY --chown=docker:docker makefiles/lsd/Makefile makefiles/lsd/module_template /home/docker/makefiles/lsd/
RUN make -C lsd all

COPY --chown=docker:docker makefiles/atuin/Makefile makefiles/atuin/atuin_init_template.sh makefiles/atuin/bash-preexec.sh makefiles/atuin/module_template /home/docker/makefiles/atuin/
RUN make -C atuin all

COPY --chown=docker:docker makefiles/zoxide/Makefile makefiles/zoxide/module_template makefiles/zoxide/zoxide_init_template.sh /home/docker/makefiles/zoxide/
RUN make -C zoxide all

RUN make -C bzip2 all

COPY --chown=docker:docker makefiles/nodejs/Makefile makefiles/nodejs/module_template /home/docker/makefiles/nodejs/
RUN make -C nodejs all

COPY --chown=docker:docker makefiles/purescript/Makefile makefiles/purescript/module_template /home/docker/makefiles/purescript/
RUN make -C purescript all

COPY --chown=docker:docker makefiles/rust_app/Makefile makefiles/rust_app/module_template /home/docker/makefiles/rust_app/
RUN make -C rust_app APP=bat APP_VERSION=0.22.1 all
RUN make -C rust_app APP=bat APP_VERSION=0.24.0 all

RUN make -C rust_app APP=broot APP_VERSION=1.20.2 all
RUN make -C rust_app APP=broot APP_VERSION=1.30.2 all

RUN make -C rust_app APP=ripgrep APP_BINARY=rg APP_VERSION=13.0.0 all
RUN make -C rust_app APP=ripgrep APP_BINARY=rg APP_VERSION=14.0.3 all

RUN make -C rust_app APP=tealdeer APP_BINARY=tldr APP_VERSION=1.6.1 all

RUN make -C rust_app APP=du-dust APP_BINARY=dust APP_VERSION=0.8.4 all
RUN make -C rust_app APP=du-dust APP_BINARY=dust APP_VERSION=0.8.6 all

RUN make -C rust_app APP=fd-find APP_BINARY=fd APP_VERSION=9.0.0 all

RUN make -C rust_app APP=fd-find APP_BINARY=fd APP_VERSION=8.7.0 all
RUN make -C rust_app APP=git-delta APP_BINARY=delta APP_VERSION=0.16.5 all

RUN make -C rust_app APP=git-delta APP_BINARY=delta APP_VERSION=0.15.1 all
RUN make -C rust_app APP=bottom APP_BINARY=btm APP_VERSION=0.9.6 all

RUN make -C rust_app APP=bottom APP_BINARY=btm APP_VERSION=0.8.0 all
RUN make -C rust_app APP=starship APP_VERSION=1.16.0 all

RUN make -C rust_app APP=starship APP_VERSION=1.13.1 all
RUN make -C rust_app APP=tokei APP_VERSION=12.1.2 all

RUN make -C rust_app APP=zellij APP_VERSION=0.39.2 all

RUN make -C rust_app APP=tidy-viewer APP_BINARY=tidy-viewer APP_VERSION=1.5.2 all

RUN make -C rust_app APP=csvlens APP_BINARY=csvlens APP_VERSION=0.4.0 all

COPY --chown=docker:docker makefiles/go_app/Makefile makefiles/go_app/module_template /home/docker/makefiles/go_app/
RUN make -C go_app APP_URL=github.com/charmbracelet/glow APP_BINARY=glow APP_VERSION=1.5.0 all
RUN make -C go_app APP_URL=github.com/charmbracelet/glow APP_BINARY=glow APP_VERSION=1.5.1 all

RUN make -C go_app APP_URL=github.com/muesli/duf APP_BINARY=duf APP_VERSION=0.8.1 all

RUN make -C go_app APP_URL=github.com/go-task/task/v3/cmd/task APP_BINARY=task APP_VERSION=3.22.0 all
RUN make -C go_app APP_URL=github.com/go-task/task/v3/cmd/task APP_BINARY=task APP_VERSION=3.33.1 all

RUN make -C go_app APP_URL=github.com/twpayne/chezmoi APP_BINARY=chezmoi APP_VERSION=latest all

RUN make -C go_app APP_URL=github.com/jesseduffield/lazydocker APP_BINARY=lazydocker APP_VERSION=0.20.0 all
RUN make -C go_app APP_URL=github.com/jesseduffield/lazydocker APP_BINARY=lazydocker APP_VERSION=0.23.1 all

RUN make -C go_app APP_URL=github.com/junegunn/fzf APP_BINARY=fzf APP_VERSION=0.44.1 APP_VERSION_PREFIX='' all

COPY --chown=docker:docker makefiles/lazygit/Makefile makefiles/lazygit/module_template /home/docker/makefiles/lazygit/
RUN make -C lazygit
Expand All @@ -142,12 +153,12 @@ RUN make -C pipx_app APP=mypy all

RUN make -C pipx_app APP=black all

RUN make -C pipx_app APP=ranger-fm APP_BINARY=ranger all

RUN make -C pipx_app APP=python-lsp-server APP_BINARY=pylsp PIPX_INJECT='pylsp-mypy pyls-isort python-lsp-black pylsp-rope' all

COPY --chown=docker:docker makefiles/nodejs_app/Makefile makefiles/nodejs_app/module_template /home/docker/makefiles/nodejs_app/
RUN make -C nodejs_app APP=pyright APP_VERSION=1.1.298 all
RUN make -C nodejs_app APP=pyright APP_VERSION=1.1.342 all

RUN make -C nodejs_app APP=prettier APP_VERSION=3.1.1 all

COPY --chown=docker:docker makefiles/std_module/Makefile makefiles/std_module/std_module.lua /home/docker/makefiles/std_module/
RUN make -C std_module all
Expand Down
9 changes: 9 additions & 0 deletions docker/conda_env.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
channels:
- conda-forge
- defaults
dependencies:
- python=3.11
- pip:
- typer
- sh

23 changes: 12 additions & 11 deletions makefiles/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,28 +53,29 @@ all clean uninstall:
# $(MAKE) -C nnn $@
# $(MAKE) -C purescript $@
# rust apps
$(MAKE) -C rust_app APP=bat APP_VERSION=0.23.0 $@
$(MAKE) -C rust_app APP=broot APP_VERSION=1.24.2 $@
$(MAKE) -C rust_app APP=ripgrep APP_BINARY=rg APP_VERSION=13.0.0 $@
$(MAKE) -C rust_app APP=bat APP_VERSION=0.24.0 $@
$(MAKE) -C rust_app APP=broot APP_VERSION=1.30.2 $@
$(MAKE) -C rust_app APP=ripgrep APP_BINARY=rg APP_VERSION=14.0.3 $@
$(MAKE) -C rust_app APP=tealdeer APP_BINARY=tldr APP_VERSION=1.6.1 $@
$(MAKE) -C rust_app APP=du-dust APP_BINARY=dust APP_VERSION=0.8.6 $@
$(MAKE) -C rust_app APP=fd-find APP_BINARY=fd APP_VERSION=8.7.0 $@
$(MAKE) -C rust_app APP=fd-find APP_BINARY=fd APP_VERSION=9.0.0 $@
$(MAKE) -C rust_app APP=git-delta APP_BINARY=delta APP_VERSION=0.16.5 $@
$(MAKE) -C rust_app APP=bottom APP_BINARY=btm APP_VERSION=0.9.3 $@
$(MAKE) -C rust_app APP=bottom APP_BINARY=btm APP_VERSION=0.9.6 $@
$(MAKE) -C rust_app APP=starship APP_VERSION=1.16.0 $@
$(MAKE) -C rust_app APP=tokei APP_VERSION=12.1.2 $@
$(MAKE) -C rust_app APP=zellij APP_VERSION=0.37.2 $@
$(MAKE) -C rust_app APP=csvlens APP_VERSION=0.3.1 $@
# $(MAKE) -C rust_app APP=qsv APP_VERSION=0.103.1 $@
$(MAKE) -C rust_app APP=tidy-viewer APP_BINARY=tidy-viewer APP_VERSION=1.5.2 $@
# $(MAKE) -C rust_app APP=joshuto APP_VERSION=0.9.4 $@
$(MAKE) -C rust_app APP=csvlens APP_BINARY=csvlens APP_VERSION=0.4.0 $@
# $(MAKE) -C rust_app APP=joshuto APP_VERSION=0.9.6 $@
# go apps
$(MAKE) -C go_app APP_URL=github.com/charmbracelet/glow APP_BINARY=glow APP_VERSION=1.5.1 $@
$(MAKE) -C go_app APP_URL=github.com/muesli/duf APP_BINARY=duf APP_VERSION=0.8.1 $@
$(MAKE) -C go_app APP_URL=github.com/go-task/task/v3/cmd/task APP_BINARY=task APP_VERSION=3.28.0 $@
$(MAKE) -C go_app APP_URL=github.com/go-task/task/v3/cmd/task APP_BINARY=task APP_VERSION=3.33.1 $@
$(MAKE) -C go_app APP_URL=github.com/twpayne/chezmoi APP_BINARY=chezmoi APP_VERSION=latest $@
$(MAKE) -C go_app APP_URL=github.com/jesseduffield/lazydocker APP_BINARY=lazydocker APP_VERSION=0.21.1 $@
$(MAKE) -C go_app APP_URL=github.com/junegunn/fzf APP_BINARY=fzf APP_VERSION=0.42.0 APP_VERSION_PREFIX='' $@
$(MAKE) -C go_app APP_URL=github.com/jesseduffield/lazydocker APP_BINARY=lazydocker APP_VERSION=0.23.1 $@
$(MAKE) -C go_app APP_URL=github.com/junegunn/fzf APP_BINARY=fzf APP_VERSION=0.44.1 APP_VERSION_PREFIX='' $@
$(MAKE) -C lazygit
$(MAKE) -C pistol
$(MAKE) -C lf
Expand All @@ -86,8 +87,8 @@ all clean uninstall:
$(MAKE) -C pipx_app APP=python-lsp-server APP_BINARY=pylsp PIPX_INJECT='pylsp-mypy pyls-isort python-lsp-black pylsp-rope' $@
# $(MAKE) -C pipx_app APP=ranger-fm APP_BINARY=ranger $@
# nodejs apps
$(MAKE) -C nodejs_app APP=pyright APP_VERSION=1.1.320 $@
$(MAKE) -C nodejs_app APP=prettier APP_VERSION=3.0.1 $@
$(MAKE) -C nodejs_app APP=pyright APP_VERSION=1.1.342 $@
$(MAKE) -C nodejs_app APP=prettier APP_VERSION=3.1.1 $@
# install the std_module
$(MAKE) -C std_module $@
# stop here if at work; below here only games
Expand Down
2 changes: 1 addition & 1 deletion makefiles/atuin/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP=atuin
APP_VERSION=15.0.0
APP_VERSION=17.1.0
OMIT_ALL=True
OMIT_CLEAN=True

Expand Down
2 changes: 1 addition & 1 deletion makefiles/cmake/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP=cmake
APP_VERSION=3.27.1
APP_VERSION=3.28.1

include ../default.mk

Expand Down
2 changes: 1 addition & 1 deletion makefiles/eza/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP=eza
APP_VERSION=0.10.5
APP_VERSION=0.17.0

include ../default.mk

Expand Down
2 changes: 1 addition & 1 deletion makefiles/git/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP=git
APP_VERSION=2.41.0
APP_VERSION=2.43.0

include ../default.mk

Expand Down
2 changes: 1 addition & 1 deletion makefiles/golang/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP=golang
APP_VERSION=1.20.7
APP_VERSION=1.21.0
APP_BINARY=go

include ../default.mk
Expand Down
2 changes: 1 addition & 1 deletion makefiles/lazygit/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP_URL=github.com/jesseduffield/lazygit
APP_BINARY=lazygit
APP_VERSION=0.39.4
APP_VERSION=0.40.2

include ../go_app/Makefile
2 changes: 1 addition & 1 deletion makefiles/libgit2/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP=libgit2
APP_VERSION=1.7.0
APP_VERSION=1.7.1
OMIT_ALL=True

include ../default.mk
Expand Down
2 changes: 1 addition & 1 deletion makefiles/lmod/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP=lmod
APP_VERSION=8.7.13
APP_VERSION=8.7.32
OMIT_ALL=True

include ../funcs.mk
Expand Down
2 changes: 1 addition & 1 deletion makefiles/lsd/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP=lsd
APP_VERSION=0.23.1
APP_VERSION=1.0.0

include ../default.mk

Expand Down
2 changes: 1 addition & 1 deletion makefiles/lua/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP=lua
APP_VERSION=5.4.4
APP_VERSION=5.4.6

include ../default.mk

Expand Down
2 changes: 1 addition & 1 deletion makefiles/luarocks/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP=luarocks
APP_VERSION=3.9.1
APP_VERSION=3.9.2

include ../funcs.mk
include ../default.mk
Expand Down
2 changes: 1 addition & 1 deletion makefiles/mambaforge/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
APP=mambaforge
APP_BINARY=mamba
APP_VERSION=23.1.0-4
APP_VERSION=23.11.0-0
OMIT_CLEAN=1

include ../default.mk
Expand Down
2 changes: 1 addition & 1 deletion makefiles/nodejs/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP=nodejs
APP_VERSION=18.17.0
APP_VERSION=20.10.0
APP_BINARY=node

include ../default.mk
Expand Down
2 changes: 1 addition & 1 deletion makefiles/nvim/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP=nvim
APP_VERSION=0.9.2
APP_VERSION=0.9.4

include ../default.mk
include ../lmod/setup_lmod.mk
Expand Down
2 changes: 1 addition & 1 deletion makefiles/openssl/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP=openssl
APP_VERSION=1.1.1v
APP_VERSION=1.1.1w
OMIT_ALL=True

include ../default.mk
Expand Down
2 changes: 1 addition & 1 deletion makefiles/pipx/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
APP=pipx
OMIT_ALL=True
PYTHON_VERSION=3.11
PYTHON_VERSION=3.12

include ../default.mk

Expand Down
1 change: 0 additions & 1 deletion makefiles/pyenv/python
View file

This file was deleted.

2 changes: 1 addition & 1 deletion makefiles/python/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP=python
APP_VERSION=3.11.1
APP_VERSION=3.11.7

include ../funcs.mk

Expand Down
2 changes: 1 addition & 1 deletion makefiles/rust/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP=rust
APP_VERSION=1.71.0
APP_VERSION=1.74.1
APP_BINARY=cargo

include ../default.mk
Expand Down
2 changes: 1 addition & 1 deletion makefiles/sqlite3/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP=sqlite3
APP_VERSION=3420000
APP_VERSION=3440200

include ../default.mk

Expand Down
1 change: 0 additions & 1 deletion makefiles/std_module/std_module.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,3 @@ load('home/lf')
load('home/tidy-viewer')
load('home/fzf')
load('home/csvlens')
--add_property("lmod","sticky")
2 changes: 1 addition & 1 deletion makefiles/utf8proc/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP=utf8proc
APP_VERSION=2.8.0
APP_VERSION=2.9.0
BINARY_TARGET=${APP_PREFIX}/lib/libutf8proc.so

include ../default.mk
Expand Down
2 changes: 1 addition & 1 deletion makefiles/zotero/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP=zotero
APP_VERSION=6.0.26
APP_VERSION=6.0.30

include ../default.mk

Expand Down
2 changes: 1 addition & 1 deletion makefiles/zoxide/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP=zoxide
APP_VERSION=0.9.1
APP_VERSION=0.9.2
OMIT_ALL=True
OMIT_CLEAN=True

Expand Down

0 comments on commit 051adb5

Please sign in to comment.