steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

feat(pkgs/logseq): bump to 0.10.9

Browse source
This commit is contained in:
steveej 2024-10-13 20:06:36 +02:00
parent 070d3037d2
commit 46df99c190
5 changed files with 24 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

28
flake.lock generated
View file

@ -412,33 +412,16 @@
"type": "github" "type": "github"
} }
}, },
"linux_x13s": { "logseq_0_10_9_aarch64_appimage": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1706261399, "narHash": "sha256-b/zzQ3hNfaSUAJmhKuZaYTY0LX7Jwch182vbNrWBh6w=",
"narHash": "sha256-NJSN4j2VbFIPerb/bFqmaYbcHjxF3u6lijuXpC0USYo=",
"owner": "jhovold",
"repo": "linux",
"rev": "b929f8eed9ad1f156cae932dea741bc4383e6367",
"type": "github"
},
"original": {
"owner": "jhovold",
"ref": "wip/sc8280xp-v6.7",
"repo": "linux",
"type": "github"
}
},
"logseq_0_10_5_aarch64_appimage": {
"flake": false,
"locked": {
"narHash": "sha256-5uHRJpNcAzVRqyF5eR2sY0u/Q9rHXWh/g36/sehmSys=",
"type": "file", "type": "file",
"url": "https://www.stefanjunker.de/downloads/Logseq-0.10.5.AppImage" "url": "https://www.stefanjunker.de/downloads/Logseq-0.10.9.AppImage"
}, },
"original": { "original": {
"type": "file", "type": "file",
"url": "https://www.stefanjunker.de/downloads/Logseq-0.10.5.AppImage" "url": "https://www.stefanjunker.de/downloads/Logseq-0.10.9.AppImage"
} }
}, },
"nix-eval-jobs": { "nix-eval-jobs": {
@ -853,8 +836,7 @@
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"get-flake": "get-flake", "get-flake": "get-flake",
"jay": "jay", "jay": "jay",
"linux_x13s": "linux_x13s", "logseq_0_10_9_aarch64_appimage": "logseq_0_10_9_aarch64_appimage",
"logseq_0_10_5_aarch64_appimage": "logseq_0_10_5_aarch64_appimage",
"nix-vscode-extensions": "nix-vscode-extensions", "nix-vscode-extensions": "nix-vscode-extensions",
"nixos-anywhere": "nixos-anywhere", "nixos-anywhere": "nixos-anywhere",
"nixpkgs": [ "nixpkgs": [

11
flake.nix
View file

@ -105,14 +105,9 @@
url = "git+https://codeberg.org/adamcstephens/stop-export.git"; url = "git+https://codeberg.org/adamcstephens/stop-export.git";
}; };
# alsa-ucm-conf = { logseq_0_10_9_aarch64_appimage = {
# flake = false;
# url = "github:alsa-project/alsa-ucm-conf/master";
# };
logseq_0_10_5_aarch64_appimage = {
flake = false; flake = false;
url = "https://www.stefanjunker.de/downloads/Logseq-0.10.5.AppImage"; url = "https://www.stefanjunker.de/downloads/Logseq-0.10.9.AppImage";
}; };
espanso = { espanso = {
@ -349,7 +344,7 @@
logseq = logseq =
pkgs.callPackage ./nix/pkgs/logseq pkgs.callPackage ./nix/pkgs/logseq
(lib.attrsets.optionalAttrs pkgs.stdenv.isAarch64 { (lib.attrsets.optionalAttrs pkgs.stdenv.isAarch64 {
overrideSrc = self.inputs.logseq_0_10_5_aarch64_appimage; overrideSrc = self.inputs.logseq_0_10_9_aarch64_appimage;
}); });
rperf = craneLib.buildPackage { rperf = craneLib.buildPackage {

11
nix/pkgs/logseq/Containerfile
View file

@ -4,7 +4,8 @@
# build-docker.yml and change the release channel from :latest to :testing # build-docker.yml and change the release channel from :latest to :testing
# Builder image # Builder image
FROM clojure:temurin-11-tools-deps-1.11.1.1208-bullseye-slim as builder # FROM clojure:temurin-11-tools-deps-1.11.1.1208-bullseye-slim as builder
FROM clojure:temurin-11-tools-deps-bullseye-slim as builder
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
@ -20,15 +21,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
# install NodeJS & yarn # install NodeJS & yarn
RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | \ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /etc/apt/trusted.gpg.d/yarn.gpg && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && apt-get update && apt-get install -y nodejs yarn
tee /etc/apt/trusted.gpg.d/yarn.gpg && \
echo "deb https://dl.yarnpkg.com/debian/ stable main" | \
tee /etc/apt/sources.list.d/yarn.list && \
apt-get update && apt-get install -y nodejs yarn
WORKDIR /data WORKDIR /data
ENV VERSION=0.10.5 ENV VERSION=0.10.9
# build Logseq static resources # build Logseq static resources
RUN git clone -b ${VERSION} https://github.com/logseq/logseq.git . RUN git clone -b ${VERSION} https://github.com/logseq/logseq.git .

13
nix/pkgs/logseq/README.md
View file

@ -2,10 +2,19 @@
this is pseudocode that serves as a reminder this is pseudocode that serves as a reminder
1. podman build -f Containerfile 1. podman build -f Containerfile -t logseq
2. CONTAINER_ID=$(podman container create logseq)
2. podman unshare 2. podman unshare
3. podman mount $CONTAINER_ID 3. podman mount $CONTAINER_ID
4. upload the AppImaeg 4. copy and upload the AppImage. e.g.
```
cp /home/steveej/.local/share/containers/storage/overlay/f932ca9f11ea2bfd6b221118eb54775a623bc519bfe38188afcbad51dda2777f/merged/Logseq-0.10.9.AppImage .
exit
scp Logseq-0.10.9.AppImage root@www.stefanjunker.de:/var/lib/container-volumes/webserver/var-www/stefanjunker.de/htdocs/caddy/downloads/
```
5. podman unshare
6. podman unmount
# resources # resources

2
nix/pkgs/logseq/default.nix
View file

@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: let
inherit (finalAttrs) pname version src appimageContents; inherit (finalAttrs) pname version src appimageContents;
in { in {
pname = "logseq"; pname = "logseq";
version = "0.10.5"; version = "0.10.9";
src = src =
if overrideSrc != null if overrideSrc != null