TheCrazyInsanity/nixos-configv3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i have to commit in order to get the patches to work

Browse Source
This commit is contained in:
TheCrazyInsanity
2026-04-05 18:08:32 -04:00
parent 00ebec0062
commit 77c77a298b
7 changed files with 331 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
global/default.nix
View File

@@ -22,6 +22,44 @@
nixpkgs.config.packageOverrides = pkgs: {
logseq-override =
(pkgs.logseq.override {
}).overrideAttrs
(oldAttrs: rec {
version = "e8bddda236c93a86167e0b619c048588c501a708";
src = pkgs.fetchFromGitHub {
owner = "logseq";
repo = "logseq";
rev = "${version}";
hash = "sha256-URmkx8LPD9sfp/qjbyP5TsXSpnZsfCz8ra44CKVPmnE=";
};
patches = [
(pkgs.replaceVars ./overrides/logseq/hardcode-git-paths.patch {
cljs_time_src = pkgs.fetchFromGitHub {
owner = "logseq";
repo = "cljs-time";
rev = "5704fbf48d3478eedcf24d458c8964b3c2fd59a9";
hash = "sha256-IApL+SEm7AhbTN7J/1KiAKTx7rd53hchRh3jmPQ412g=";
};
bb_tasks_src = pkgs.fetchFromGitHub {
owner = "logseq";
repo = "bb-tasks";
rev = "70d3edeb287f5cec7192e642549a401f7d6d4263";
hash = "sha256-xVJj5XCkqfaNjnhYZkuqTSJN0ry8UVMaN44r9pxggB0=";
};
})
./overrides/logseq/electron-forge-package-instead-of-make.patch
./overrides/logseq/electron-forge-disable-signing.patch
# bumps better-sqlite3 to work with electron 39+
# also fixes outdated yarn.lock
./overrides/logseq/bump-better-sqlite3.patch
];
});
# Stolen from https://www.nijho.lt/post/llama-nixos/
llama-cpp =
(pkgs.llama-cpp.override {
@@ -33,13 +71,13 @@
blasSupport = true;
}).overrideAttrs
(oldAttrs: rec {
version = "8209";
version = "8660";
src = pkgs.fetchFromGitHub {
owner = "ggml-org";
repo = "llama.cpp";
tag = "b${version}";
# rev = "6ebf2e0d00d31acfc1a1fa9662e9a7d38bd07bf7"; # https://github.com/ggml-org/llama.cpp/pull/19970
hash = "sha256-7z9mQZ/hgNS+doLCVPtax+FBhr6dEfmR9wZJTwtl/pM=";
hash = "sha256-4QwFMHpaYeD+aul/p5XFBRYivJ6WgI1kxecbrqFml6o=";
leaveDotGit = true;
postFetch = ''
git -C "$out" rev-parse --short HEAD > $out/COMMIT
@@ -47,7 +85,7 @@
'';
};
# Must update npm deps hash to match the new version's webui dependencies
npmDepsHash = "sha256-FKjoZTKm0ddoVdpxzYrRUmTiuafEfbKc4UD2fz2fb8A=";
npmDepsHash = "sha256-DxgUDVr+kwtW55C4b89Pl+j3u2ILmACcQOvOBjKWAKQ=";
# Enable native CPU optimizations for massively better CPU performance
# This enables AVX, AVX2, AVX-512, FMA, etc. for your specific CPU
# NOTE: This is intentionally opposite of nixpkgs (which uses -DGGML_NATIVE=off
@@ -80,6 +118,8 @@
"-DGGML_BLAS=ON" # Uses internal BLAS provided by Nix (blasSupport=true works)
];
postPatch = "";
# Disable Nix's NIX_ENFORCE_NO_NATIVE which strips -march=native flags
# See: https://github.com/NixOS/nixpkgs/issues/357736
# See: https://github.com/NixOS/nixpkgs/pull/377484 (intentionally contradicts this)
@@ -230,6 +270,7 @@
android-tools
jq
nasctui
logseq-override
];
services.usbmuxd = {

129
global/overrides/logseq/bump-better-sqlite3.patch Normal file
View File

@@ -0,0 +1,129 @@
diff --git a/resources/package.json b/resources/package.json
index de39ccc..d42b7fb 100644
--- a/resources/package.json
+++ b/resources/package.json
@@ -25,7 +25,7 @@
"@logseq/rsapi": "0.0.92",
"@sentry/electron": "2.5.1",
"abort-controller": "3.0.0",
- "better-sqlite3": "12.4.1",
+ "better-sqlite3": "12.8.0",
"chokidar": "^3.5.1",
"command-exists": "1.2.9",
"diff-match-patch": "1.0.5",
diff --git a/static/yarn.lock b/static/yarn.lock
index 36b4476..4738ef9 100644
--- a/static/yarn.lock
+++ b/static/yarn.lock
@@ -1444,11 +1444,6 @@ ansi-regex@^5.0.1:
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-ansi-regex@^6.0.1:
- version "6.2.2"
- resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.2.2.tgz#60216eea464d864597ce2832000738a0589650c1"
- integrity sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==
-
ansi-styles@^4.0.0, ansi-styles@^4.1.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
@@ -1461,11 +1456,6 @@ ansi-styles@^6.0.0:
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
-ansi-styles@^6.2.1:
- version "6.2.3"
- resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.3.tgz#c044d5dcc521a076413472597a1acb1f103c4041"
- integrity sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==
-
anymatch@~3.1.2:
version "3.1.3"
resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
@@ -1653,10 +1643,10 @@ baseline-browser-mapping@^2.8.25:
resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.8.28.tgz#9ef511f5a7c19d74a94cafcbf951608398e9bdb3"
integrity sha512-gYjt7OIqdM0PcttNYP2aVrr2G0bMALkBaoehD4BuRGjAOtipg0b6wHg1yNL+s5zSnLZZrGHOw4IrND8CD+3oIQ==
-better-sqlite3@12.4.1:
- version "12.4.1"
- resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-12.4.1.tgz#f78df6c80530d1a0b750b538033e6199b7d30d26"
- integrity sha512-3yVdyZhklTiNrtg+4WqHpJpFDd+WHTg2oM7UcR80GqL05AOV0xEJzc6qNvFYoEtE+hRp1n9MpN6/+4yhlGkDXQ==
+better-sqlite3@12.8.0:
+ version "12.8.0"
+ resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-12.8.0.tgz#ec9ccd4a426a35f3b9355c147af6c92a6ddd6862"
+ integrity sha512-RxD2Vd96sQDjQr20kdP+F+dK/1OUNiVOl200vKBZY8u0vTwysfolF6Hq+3ZK2+h8My9YvZhHsF+RSGZW2VYrPQ==
dependencies:
bindings "^1.5.0"
prebuild-install "^7.1.1"
@@ -3081,11 +3071,6 @@ get-caller-file@^2.0.5:
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-get-east-asian-width@^1.3.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/get-east-asian-width/-/get-east-asian-width-1.4.0.tgz#9bc4caa131702b4b61729cb7e42735bc550c9ee6"
- integrity sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==
-
get-folder-size@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/get-folder-size/-/get-folder-size-2.0.1.tgz#3fe0524dd3bad05257ef1311331417bcd020a497"
@@ -5201,13 +5186,14 @@ stream-buffers@~2.2.0:
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"
-string-width@8.1.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3, string-width@^5.0.0, string-width@^5.1.2, string-width@^7.0.0:
- version "8.1.0"
- resolved "https://registry.yarnpkg.com/string-width/-/string-width-8.1.0.tgz#9e9fb305174947cf45c30529414b5da916e9e8d1"
- integrity sha512-Kxl3KJGb/gxkaUMOjRsQ8IrXiGW75O4E3RPjFIINOVH8AMl2SQ/yWdTzWwF3FevIX9LcMAjJW+GRwAlAbTSXdg==
+string-width@4.2.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3, string-width@^5.0.0, string-width@^5.1.2:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
+ integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
dependencies:
- get-east-asian-width "^1.3.0"
- strip-ansi "^7.1.0"
+ emoji-regex "^8.0.0"
+ is-fullwidth-code-point "^3.0.0"
+ strip-ansi "^6.0.0"
string_decoder@^1.1.1:
version "1.3.0"
@@ -5223,12 +5209,12 @@ string_decoder@^1.1.1:
dependencies:
ansi-regex "^5.0.1"
-strip-ansi@7.1.2, strip-ansi@^6.0.0, strip-ansi@^6.0.1, strip-ansi@^7.0.1, strip-ansi@^7.1.0:
- version "7.1.2"
- resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.2.tgz#132875abde678c7ea8d691533f2e7e22bb744dba"
- integrity sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==
+strip-ansi@^6.0.0, strip-ansi@^6.0.1, strip-ansi@^7.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+ integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
- ansi-regex "^6.0.1"
+ ansi-regex "^5.0.1"
strip-bom@^3.0.0:
version "3.0.0"
@@ -5710,14 +5696,14 @@ word-wrap@^1.2.3:
string-width "^4.1.0"
strip-ansi "^6.0.0"
-wrap-ansi@9.0.2, wrap-ansi@^6.2.0, wrap-ansi@^7.0.0, wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
- version "9.0.2"
- resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-9.0.2.tgz#956832dea9494306e6d209eb871643bb873d7c98"
- integrity sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==
+wrap-ansi@^6.2.0, wrap-ansi@^7.0.0, wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+ integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
- ansi-styles "^6.2.1"
- string-width "^7.0.0"
- strip-ansi "^7.1.0"
+ ansi-styles "^4.0.0"
+ string-width "^4.1.0"
+ strip-ansi "^6.0.0"
wrappy@1:
version "1.0.2"

24
global/overrides/logseq/electron-forge-disable-signing.patch Normal file
View File

@@ -0,0 +1,24 @@
diff --git a/resources/forge.config.js b/resources/forge.config.js
index 5a349a2..f967102 100644
--- a/resources/forge.config.js
+++ b/resources/forge.config.js
@@ -13,19 +13,6 @@ module.exports = {
"schemes": "logseq"
}
],
- osxSign: {
- identity: 'Developer ID Application: Tiansheng Qin',
- 'hardened-runtime': true,
- entitlements: 'entitlements.plist',
- 'entitlements-inherit': 'entitlements.plist',
- 'signature-flags': 'library'
- },
- osxNotarize: {
- tool: 'notarytool',
- appleId: process.env['APPLE_ID'],
- appleIdPassword: process.env['APPLE_ID_PASSWORD'],
- teamId: process.env['APPLE_TEAM_ID']
- },
},
makers: [
{

13
global/overrides/logseq/electron-forge-package-instead-of-make.patch Normal file
View File

@@ -0,0 +1,13 @@
diff --git a/resources/package.json b/resources/package.json
index 3445cbb..03927d4 100644
--- a/resources/package.json
+++ b/resources/package.json
@@ -10,7 +10,7 @@
"scripts": {
"electron:dev": "electron-forge start",
"electron:debug": "electron-forge start --inspect-electron",
- "electron:make": "electron-forge make",
+ "electron:make": "electron-forge package",
"electron:make-linux-arm64": "electron-forge make --platform=linux --arch=arm64",
"electron:make-macos-arm64": "electron-forge make --platform=darwin --arch=arm64",
"electron:publish:github": "electron-forge publish",

99
global/overrides/logseq/hardcode-git-paths.patch Normal file
View File

@@ -0,0 +1,99 @@
diff --git a/bb.edn b/bb.edn
index 76e1ba1..43d2c73 100644
--- a/bb.edn
+++ b/bb.edn
@@ -4,8 +4,7 @@
{:mvn/version "0.10.0"}
logseq/bb-tasks
#_{:local/root "../bb-tasks"}
- {:git/url "https://github.com/logseq/bb-tasks"
- :git/sha "70d3edeb287f5cec7192e642549a401f7d6d4263"}
+ {:local/root "@bb_tasks_src@"}
logseq/graph-parser
{:local/root "deps/graph-parser"}
org.clj-commons/digest
diff --git a/deps.edn b/deps.edn
index 9fb41e5..2b45436 100644
--- a/deps.edn
+++ b/deps.edn
@@ -11,8 +11,7 @@
cljs-bean/cljs-bean {:mvn/version "1.9.0"}
prismatic/dommy {:mvn/version "1.1.0"}
org.clojure/core.match {:mvn/version "1.0.0"}
- com.andrewmcveigh/cljs-time {:git/url "https://github.com/logseq/cljs-time" ;; fork
- :sha "5704fbf48d3478eedcf24d458c8964b3c2fd59a9"}
+ com.andrewmcveigh/cljs-time {:local/root "@cljs_time_src@"}
;; TODO: delete cljs-drag-n-drop and use dnd-kit
cljs-drag-n-drop/cljs-drag-n-drop {:mvn/version "0.1.0"}
cljs-http/cljs-http {:mvn/version "0.1.48"}
org.babashka/sci {:mvn/version "0.3.2"}
diff --git a/deps/common/bb.edn b/deps/common/bb.edn
index 3188222..1dba8a9 100644
--- a/deps/common/bb.edn
+++ b/deps/common/bb.edn
@@ -2,8 +2,7 @@
:deps
{logseq/bb-tasks
#_{:local/root "../../../bb-tasks"}
- {:git/url "https://github.com/logseq/bb-tasks"
- :git/sha "70d3edeb287f5cec7192e642549a401f7d6d4263"}}
+ {:local/root "@bb_tasks_src@"}}
:pods
{clj-kondo/clj-kondo {:version "2023.05.26"}}
diff --git a/deps/db/bb.edn b/deps/db/bb.edn
index 2bf0931..e3d5ea8 100644
--- a/deps/db/bb.edn
+++ b/deps/db/bb.edn
@@ -3,8 +3,7 @@
:deps
{logseq/bb-tasks
#_{:local/root "../../../bb-tasks"}
- {:git/url "https://github.com/logseq/bb-tasks"
- :git/sha "70d3edeb287f5cec7192e642549a401f7d6d4263"}}
+ {:local/root "@bb_tasks_src@"}}
:pods
{clj-kondo/clj-kondo {:version "2023.05.26"}}
diff --git a/deps/graph-parser/bb.edn b/deps/graph-parser/bb.edn
index 5093ff5..9cb7c54 100644
--- a/deps/graph-parser/bb.edn
+++ b/deps/graph-parser/bb.edn
@@ -2,8 +2,7 @@
:deps
{logseq/bb-tasks
#_{:local/root "../../../bb-tasks"}
- {:git/url "https://github.com/logseq/bb-tasks"
- :git/sha "70d3edeb287f5cec7192e642549a401f7d6d4263"}}
+ {:local/root "@bb_tasks_src@"}}
:pods
{clj-kondo/clj-kondo {:version "2023.05.26"}}
diff --git a/deps/graph-parser/deps.edn b/deps/graph-parser/deps.edn
index 4675c30..57abe35 100644
--- a/deps/graph-parser/deps.edn
+++ b/deps/graph-parser/deps.edn
@@ -1,8 +1,7 @@
{:paths ["src"]
:deps
;; External deps should be kept in sync with https://github.com/logseq/nbb-logseq/blob/main/bb.edn
- {com.andrewmcveigh/cljs-time {:git/url "https://github.com/logseq/cljs-time" ;; fork
- :sha "5704fbf48d3478eedcf24d458c8964b3c2fd59a9"}
+ {com.andrewmcveigh/cljs-time {:local/root "@cljs_time_src@"}
;; local deps
logseq/db {:local/root "../db"}
logseq/common {:local/root "../common"}
diff --git a/deps/publishing/bb.edn b/deps/publishing/bb.edn
index 878757b..2fce25a 100644
--- a/deps/publishing/bb.edn
+++ b/deps/publishing/bb.edn
@@ -2,8 +2,7 @@
:deps
{logseq/bb-tasks
#_{:local/root "../../../bb-tasks"}
- {:git/url "https://github.com/logseq/bb-tasks"
- :git/sha "70d3edeb287f5cec7192e642549a401f7d6d4263"}}
+ {:local/root "@bb_tasks_src@"}}
:pods
{clj-kondo/clj-kondo {:version "2023.05.26"}}