upgrade system, kernel -> 6.10.3
This commit is contained in:
parent
38d3c984ba
commit
4f6550e9bc
GPG Key ID:
FD266B810DF48DF2
171
flake.lock
generated
171
flake.lock
generated
@ -8,11 +8,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721560199,
|
||||
"narHash": "sha256-XQVh+i9/m2J2AfwuqJcKpm3GM67Top8mHKgaJ7lL1l0=",
|
||||
"lastModified": 1722680456,
|
||||
"narHash": "sha256-q3ZxjLD/6WnAGwihLlRLoEzIEaVE1AqnH5h1TePYP/I=",
|
||||
"owner": "ezKEa",
|
||||
"repo": "aagl-gtk-on-nix",
|
||||
"rev": "cdb74c540af1d365ea799ba5d2200df707e31090",
|
||||
"rev": "54264a57d0c58afd12888eb1c576f96ca811530c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -26,11 +26,11 @@
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721550014,
|
||||
"narHash": "sha256-3y3dbiO4EiC7nBNKcAitJKh7MsKg2KiPKfb7NLi9RWg=",
|
||||
"lastModified": 1723018841,
|
||||
"narHash": "sha256-EFm+tOPiWfuwgn/4i7TQVm9NEokxnMyFrVPw9QDZT00=",
|
||||
"owner": "AtaraxiaSjel",
|
||||
"repo": "nur",
|
||||
"rev": "f3e6bd31145b8de7b6e3600b0da8f0006bc11ce4",
|
||||
"rev": "97044ef6eba22708d705383dc0c3c6760e266cde",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -48,11 +48,11 @@
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1720542474,
|
||||
"narHash": "sha256-aKjJ/4l2I9+wNGTaOGRsuS3M1+IoTibqgEMPDikXm04=",
|
||||
"lastModified": 1722472866,
|
||||
"narHash": "sha256-GJIz4M5HDB948Ex/8cPvbkrNzl/eKUE7/c21JBu4lb8=",
|
||||
"owner": "zhaofengli",
|
||||
"repo": "attic",
|
||||
"rev": "6139576a3ce6bb992e0f6c3022528ec233e45f00",
|
||||
"rev": "e127acbf9a71ebc0c26bc8e28346822e0a6e16ba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -148,11 +148,11 @@
|
||||
},
|
||||
"catppuccin": {
|
||||
"locked": {
|
||||
"lastModified": 1720472194,
|
||||
"narHash": "sha256-CYscFEts6tyvosc1T29nxhzIYJAj/1CCEkV3ZMzSN/c=",
|
||||
"lastModified": 1722997334,
|
||||
"narHash": "sha256-vE5FcKVQ3E0txJKt5w3vOlfcN1XoTAlxK9PnQ/CJavA=",
|
||||
"owner": "catppuccin",
|
||||
"repo": "nix",
|
||||
"rev": "d75d5803852fb0833767dc969a4581ac13204e22",
|
||||
"rev": "66f4ea170093b62f319f41cebd2337a51b225c5a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -166,11 +166,11 @@
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721283742,
|
||||
"narHash": "sha256-g+dnR0c/rTwxb0mTscu5/y1MVDL5rbBxNAJeN47ATzw=",
|
||||
"lastModified": 1722939363,
|
||||
"narHash": "sha256-qNHJzxdVf8uoV686fmK7DaTztALCyTh7erP/lYb60hg=",
|
||||
"owner": "catppuccin",
|
||||
"repo": "vscode",
|
||||
"rev": "7ab535427f0d5d128d0bec702abd03758f86d8c2",
|
||||
"rev": "2d7388ffe7321f588b2f54e2ffaab9fb7c9dde14",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -190,11 +190,11 @@
|
||||
"yafas": "yafas"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721734606,
|
||||
"narHash": "sha256-7ALQkNFMzDhpuu0eMgHcwRdMjkrTclERKMCIz6XIM5A=",
|
||||
"lastModified": 1722963859,
|
||||
"narHash": "sha256-TQ5sQ+PX0OeMZx+nYBA0CL3R9Yv6MupLzFU0iQrGGrc=",
|
||||
"owner": "chaotic-cx",
|
||||
"repo": "nyx",
|
||||
"rev": "519b516f78421e3b8cdefa89d826c101c7126a0d",
|
||||
"rev": "f41d02a7ca6433c98fac378569617f2652628624",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -268,11 +268,11 @@
|
||||
"pre-commit-hooks": "pre-commit-hooks"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721650703,
|
||||
"narHash": "sha256-GNPOqEGUd+AMiR84AD7yiPFQd/c/6K1URkBx9SL8dbk=",
|
||||
"lastModified": 1722937792,
|
||||
"narHash": "sha256-gyudaKQ8oBk13wIRGNWEkoiw6F+RMsZxHXxCsyHtIic=",
|
||||
"owner": "cachix",
|
||||
"repo": "devenv",
|
||||
"rev": "6450828d038d743e97e2e7ff567ce5fa9f17a224",
|
||||
"rev": "bc9926e2cbef29c927b0a959bed5eeba2b55d648",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -319,11 +319,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721735625,
|
||||
"narHash": "sha256-4T0FK0b3Q7Dd7oj79M7GhA9+YqKxxGT0iN+h8yqdP7s=",
|
||||
"lastModified": 1722821805,
|
||||
"narHash": "sha256-FGrUPUD+LMDwJsYyNSxNIzFMldtCm8wXiQuyL2PHSrM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "4698b1ef375e9c904037e0b2049aa73d39ac1b2d",
|
||||
"rev": "0257e44f4ad472b54f19a6dd1615aee7fa48ed49",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -480,11 +480,11 @@
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719994518,
|
||||
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
|
||||
"lastModified": 1722555600,
|
||||
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
|
||||
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -770,11 +770,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721534365,
|
||||
"narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=",
|
||||
"lastModified": 1722630065,
|
||||
"narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "635563f245309ef5320f80c7ebcb89b2398d2949",
|
||||
"rev": "afc892db74d65042031a093adb6010c4c3378422",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -790,11 +790,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721714663,
|
||||
"narHash": "sha256-ZDW5+rlROxaOuoEfIQM7Gqhoa+WALEYdYIiZhyJjAu0=",
|
||||
"lastModified": 1723015306,
|
||||
"narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "7560dc942a6fbd37ebd1310b3dbda513de2d4b82",
|
||||
"rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -827,11 +827,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721226562,
|
||||
"narHash": "sha256-KfdwusX12hhkzXKBmu2HhaU9EhaxVeWLDQw1Ll2A03o=",
|
||||
"lastModified": 1722666143,
|
||||
"narHash": "sha256-uTr3LiytFHFUYmIrhs5NoGlm5DCJxQlfyaZEKCU/DS8=",
|
||||
"owner": "Jovian-Experiments",
|
||||
"repo": "Jovian-NixOS",
|
||||
"rev": "927eea31915468e06b94bedf678261dc7cf048c8",
|
||||
"rev": "bcfe9dc708c92590fec676692b3ed79443eda819",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -930,11 +930,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721032743,
|
||||
"narHash": "sha256-p8i4j8hulVsDCdiUZzIJJrAh+WJSovMvrq0EiC/hHTo=",
|
||||
"lastModified": 1722576181,
|
||||
"narHash": "sha256-0YYH6dTJK+mzqH7KvXep5Zv/qjHCGv+hM1eLMd0aBM4=",
|
||||
"owner": "thiagokokada",
|
||||
"repo": "nix-alien",
|
||||
"rev": "ed2c6913a97efad914055ecda76bbe868c4aa5ab",
|
||||
"rev": "5d41c9c1aac104c15d06808f0c35c23e26809875",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -946,7 +946,7 @@
|
||||
"nix-direnv": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_2",
|
||||
"nixpkgs": "nixpkgs_12",
|
||||
"nixpkgs": "nixpkgs_11",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
@ -1049,7 +1049,10 @@
|
||||
},
|
||||
"nix-index-database": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_11"
|
||||
"nixpkgs": [
|
||||
"nix-alien",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1720926593,
|
||||
@ -1074,11 +1077,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721698116,
|
||||
"narHash": "sha256-JdgX4TIroHxE4lBzZSyxxSvWGi8zveV34KfHuS9by2w=",
|
||||
"lastModified": 1722994187,
|
||||
"narHash": "sha256-K5V2N5HkGaLpf5StNbtKBM6O9K+CYF/8F8hlGUVgiKk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-vscode-extensions",
|
||||
"rev": "7beca30ffc495e5e3980495e1179939abf0ab8a6",
|
||||
"rev": "6fc50b0716bc415cfd1bc81bb9e198d78cd03b3d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1136,11 +1139,11 @@
|
||||
},
|
||||
"nixlib": {
|
||||
"locked": {
|
||||
"lastModified": 1719708727,
|
||||
"narHash": "sha256-XFNKtyirrGNdehpg7lMNm1skEcBApjqGhaHc/OI95HY=",
|
||||
"lastModified": 1722732880,
|
||||
"narHash": "sha256-do2Mfm3T6SR7a5A804RhjQ+JTsF5hk4JTPGjCTRM/m8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "1bba8a624b3b9d4f68db94fb63aaeb46039ce9e6",
|
||||
"rev": "8bebd4c74f368aacb047f0141db09ec6b339733c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1157,11 +1160,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1720859326,
|
||||
"narHash": "sha256-i8BiZj5faQS6gsupE0S9xtiyZmWinGpVLwxXWV342aQ=",
|
||||
"lastModified": 1722819251,
|
||||
"narHash": "sha256-f99it92NQSZsrZ8AYbiwAUfrtb/ZpZRqUsl4q6rMA5s=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixos-generators",
|
||||
"rev": "076ea5b672bb1ea535ee84cfdabd0c2f0b7f20c7",
|
||||
"rev": "c8c3a20b8191819219dba1af79388aa6d555f634",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1188,14 +1191,14 @@
|
||||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1719876945,
|
||||
"narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=",
|
||||
"lastModified": 1722555339,
|
||||
"narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib_2": {
|
||||
@ -1212,11 +1215,11 @@
|
||||
},
|
||||
"nixpkgs-master": {
|
||||
"locked": {
|
||||
"lastModified": 1721737662,
|
||||
"narHash": "sha256-Hry9QNr5oJ8cT9P8jUzA1hq+0PyXfW39Ama6HhJnfrY=",
|
||||
"lastModified": 1723031421,
|
||||
"narHash": "sha256-Q4iMzihS+4mzCadp+ADr782Jrd1Mgvr7lLZbkWx33Hw=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f9e9e91587171c2e110cd454b556265a0dc24022",
|
||||
"rev": "1602c0d3c0247d23eb7ca501c3e592aa1762e37b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1308,11 +1311,11 @@
|
||||
},
|
||||
"nixpkgs-stable_3": {
|
||||
"locked": {
|
||||
"lastModified": 1721548954,
|
||||
"narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=",
|
||||
"lastModified": 1722869614,
|
||||
"narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "63d37ccd2d178d54e7fb691d7ec76000740ea24a",
|
||||
"rev": "883180e6550c1723395a3a342f830bfc5c371f6b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1355,22 +1358,6 @@
|
||||
}
|
||||
},
|
||||
"nixpkgs_11": {
|
||||
"locked": {
|
||||
"lastModified": 1720768451,
|
||||
"narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_12": {
|
||||
"locked": {
|
||||
"lastModified": 1720368505,
|
||||
"narHash": "sha256-5r0pInVo5d6Enti0YwUSQK4TebITypB42bWy5su3MrQ=",
|
||||
@ -1386,13 +1373,13 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_13": {
|
||||
"nixpkgs_12": {
|
||||
"locked": {
|
||||
"lastModified": 1721562059,
|
||||
"narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=",
|
||||
"lastModified": 1722813957,
|
||||
"narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe",
|
||||
"rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1402,7 +1389,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_14": {
|
||||
"nixpkgs_13": {
|
||||
"locked": {
|
||||
"lastModified": 1720768451,
|
||||
"narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=",
|
||||
@ -1468,11 +1455,11 @@
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1721562059,
|
||||
"narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=",
|
||||
"lastModified": 1722813957,
|
||||
"narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe",
|
||||
"rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1634,15 +1621,15 @@
|
||||
"flake-compat": "flake-compat_9",
|
||||
"flake-parts": "flake-parts_4",
|
||||
"libnbtplusplus": "libnbtplusplus",
|
||||
"nixpkgs": "nixpkgs_14",
|
||||
"nixpkgs": "nixpkgs_13",
|
||||
"pre-commit-hooks": "pre-commit-hooks_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721445179,
|
||||
"narHash": "sha256-+2MLhbTgImchDmHZRjHEqXJa4PYjJLBtx9MsHsTSVkg=",
|
||||
"lastModified": 1722050029,
|
||||
"narHash": "sha256-FoFsw+BhdJAtiT+tVmyOT6GFw7pCFy2Ox1JXBt5ZwME=",
|
||||
"owner": "AtaraxiaSjel",
|
||||
"repo": "PrismLauncher",
|
||||
"rev": "47e1efc0f89b4670a61b9ab9589a74cdb44240ee",
|
||||
"rev": "67aede29f4e4271e566189e7a85a943401aa543e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1676,7 +1663,7 @@
|
||||
"nix-fast-build": "nix-fast-build",
|
||||
"nix-vscode-marketplace": "nix-vscode-marketplace",
|
||||
"nixos-generators": "nixos-generators",
|
||||
"nixpkgs": "nixpkgs_13",
|
||||
"nixpkgs": "nixpkgs_12",
|
||||
"nixpkgs-master": "nixpkgs-master",
|
||||
"nixpkgs-stable": "nixpkgs-stable_3",
|
||||
"prismlauncher": "prismlauncher",
|
||||
@ -1691,11 +1678,11 @@
|
||||
"nixpkgs-stable": "nixpkgs-stable_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721688883,
|
||||
"narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=",
|
||||
"lastModified": 1722897572,
|
||||
"narHash": "sha256-3m/iyyjCdRBF8xyehf59QlckIcmShyTesymSb+N4Ap4=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "aff2f88277dabe695de4773682842c34a0b7fd54",
|
||||
"rev": "8ae477955dfd9cbf5fa4eb82a8db8ddbb94e79d9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@ -160,12 +160,12 @@
|
||||
shared-patches = patchesPath [ ];
|
||||
unstable-patches = shared-patches ++ patchesPath [
|
||||
"netbird-24.11.patch"
|
||||
"ollama-0.2.8.patch"
|
||||
"onlyoffice.patch"
|
||||
"vaultwarden.patch"
|
||||
"quirc.patch"
|
||||
# "zen-kernels.patch"
|
||||
"fix-args-override.patch"
|
||||
"zfs-2.2.5.patch"
|
||||
"pahole-fix.patch"
|
||||
];
|
||||
stable-patches = shared-patches ++ patchesPath [
|
||||
"netbird-24.05.patch" "vaultwarden-24.05.patch"
|
||||
|
||||
@ -42,16 +42,16 @@
|
||||
buildPackages = final.buildPackages // { stdenv = stdenvLLVM; };
|
||||
stdenv = stdenvLLVM;
|
||||
argsOverride = let
|
||||
version = "6.8.12";
|
||||
suffix = "lqx2";
|
||||
hash = "sha256-/CoEY+d95CFatz+P6yGerJ1p076QP7nCny4ipO3MXDQ=";
|
||||
version = "6.10.3";
|
||||
suffix = "lqx1";
|
||||
hash = "sha256-495xe6wZOMwy/N9yqwlGLTcAWuubUzmfoGOV7J1RWGk=";
|
||||
|
||||
no-dynamic-linker-patch = {
|
||||
name = "no-dynamic-linker";
|
||||
patch = ./no-dynamic-linker.patch;
|
||||
};
|
||||
fix-znver-clang18 = {
|
||||
name = "fix-znver-clang18.patch";
|
||||
name = "fix-znver-clang18";
|
||||
patch = ./fix-znver-clang18.patch;
|
||||
};
|
||||
in {
|
||||
|
||||
@ -24,7 +24,7 @@ index 3c51f806d..a8a363761 100755
|
||||
+ f' sha256 = "{sha256}"; #{variant}',
|
||||
result)
|
||||
print(result, end='')
|
||||
|
||||
|
||||
diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
|
||||
index 3acf40121..9e2c968ac 100644
|
||||
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
|
||||
@ -32,42 +32,42 @@ index 3acf40121..9e2c968ac 100644
|
||||
@@ -1,20 +1,22 @@
|
||||
-{ lib, stdenv, fetchFromGitHub, buildLinux, ... } @ args:
|
||||
+{ lib, stdenv, fetchFromGitHub, buildLinux, variant, ... } @ args:
|
||||
|
||||
|
||||
let
|
||||
# comments with variant added for update script
|
||||
- # ./update-zen.py zen
|
||||
- zenVariant = {
|
||||
- version = "6.9.8"; #zen
|
||||
- version = "6.10.1"; #zen
|
||||
- suffix = "zen1"; #zen
|
||||
- sha256 = "1ixrdx2a6jp1x8kryjmxnrgl0fsrjg6fngg5c48vbl2574nizlbz"; #zen
|
||||
- sha256 = "0lr9qjz4hlvx3yc0lj65fnmbciyh6symycbi9ass761l1niswbk5"; #zen
|
||||
- isLqx = false;
|
||||
- };
|
||||
- # ./update-zen.py lqx
|
||||
- lqxVariant = {
|
||||
- version = "6.9.8"; #lqx
|
||||
- version = "6.9.11"; #lqx
|
||||
- suffix = "lqx1"; #lqx
|
||||
- sha256 = "1r5ld2xibr0qkwi1yy7h746sclsmd8cq68z0zdpbbn2qrgyx302k"; #lqx
|
||||
- sha256 = "0i6i0ak10gswlk60pnkn5dlz74g4nd7n1xbnvf24nnwwp69kkd44"; #lqx
|
||||
- isLqx = true;
|
||||
+ variants = {
|
||||
+ # ./update-zen.py zen
|
||||
+ zen = {
|
||||
+ version = "6.9.8"; #zen
|
||||
+ version = "6.10.1"; #zen
|
||||
+ suffix = "zen1"; #zen
|
||||
+ sha256 = "1ixrdx2a6jp1x8kryjmxnrgl0fsrjg6fngg5c48vbl2574nizlbz"; #zen
|
||||
+ sha256 = "0lr9qjz4hlvx3yc0lj65fnmbciyh6symycbi9ass761l1niswbk5"; #zen
|
||||
+ isLqx = false;
|
||||
+ };
|
||||
+ # ./update-zen.py lqx
|
||||
+ lqx = {
|
||||
+ version = "6.9.8"; #lqx
|
||||
+ version = "6.9.11"; #lqx
|
||||
+ suffix = "lqx1"; #lqx
|
||||
+ sha256 = "1r5ld2xibr0qkwi1yy7h746sclsmd8cq68z0zdpbbn2qrgyx302k"; #lqx
|
||||
+ sha256 = "0i6i0ak10gswlk60pnkn5dlz74g4nd7n1xbnvf24nnwwp69kkd44"; #lqx
|
||||
+ isLqx = true;
|
||||
+ };
|
||||
};
|
||||
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
|
||||
inherit version;
|
||||
@@ -123,7 +125,4 @@ let
|
||||
|
||||
|
||||
} // (args.argsOverride or { }));
|
||||
in
|
||||
-{
|
||||
@ -83,7 +83,7 @@ index bc80ec658..edc94fc34 100644
|
||||
@@ -227,19 +227,21 @@ in {
|
||||
# https://github.com/NixOS/nixpkgs/pull/161773#discussion_r820134708
|
||||
zenKernels = callPackage ../os-specific/linux/kernel/zen-kernels.nix;
|
||||
|
||||
|
||||
- linux_zen = (zenKernels {
|
||||
+ linux_zen = zenKernels {
|
||||
+ variant = "zen";
|
||||
@ -93,7 +93,7 @@ index bc80ec658..edc94fc34 100644
|
||||
];
|
||||
- }).zen;
|
||||
+ };
|
||||
|
||||
|
||||
- linux_lqx = (zenKernels {
|
||||
+ linux_lqx = zenKernels {
|
||||
+ variant = "lqx";
|
||||
@ -103,6 +103,6 @@ index bc80ec658..edc94fc34 100644
|
||||
];
|
||||
- }).lqx;
|
||||
+ };
|
||||
|
||||
|
||||
# This contains the variants of the XanMod kernel
|
||||
xanmodKernels = callPackage ../os-specific/linux/kernel/xanmod-kernels.nix {
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix
|
||||
index b77a7de7b..a00def5fb 100644
|
||||
--- a/pkgs/development/python-modules/jaxlib/default.nix
|
||||
+++ b/pkgs/development/python-modules/jaxlib/default.nix
|
||||
@@ -377,7 +377,7 @@ let
|
||||
{ x86_64-linux = "sha256-vUoAPkYKEnHkV4fw6BI0mCeuP2e8BMCJnVuZMm9LwSA="; }
|
||||
else
|
||||
{
|
||||
- x86_64-linux = "sha256-R1TIIyyyLlDqAlUkuhJhtyTxZMra2q5S/jX0OCInsEQ=";
|
||||
+ x86_64-linux = "sha256-R5Bm+0GYN1zJ1aEUBW76907MxYKAIawHHJoIb1RdsKE=";
|
||||
aarch64-linux = "sha256-P5JEmJljN1DeRA0dNkzyosKzRnJH+5SD2aWdV5JsoiY=";
|
||||
}
|
||||
).${effectiveStdenv.system} or (throw "jaxlib: unsupported system: ${effectiveStdenv.system}");
|
||||
@ -1,511 +0,0 @@
|
||||
From 26a309c6d6d7b62af1fa7a3ba88f5af0e854b2da Mon Sep 17 00:00:00 2001
|
||||
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
|
||||
Date: Tue, 23 Jul 2024 10:15:42 +0200
|
||||
Subject: [PATCH 1/4] ollama: 0.2.7 -> 0.2.8
|
||||
|
||||
changelog: https://github.com/ollama/ollama/releases/tag/v0.2.8
|
||||
diff: https://github.com/ollama/ollama/compare/v0.2.7..v0.2.8
|
||||
---
|
||||
pkgs/by-name/ol/ollama/package.nix | 14 +++++++-------
|
||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
|
||||
index 6dd421ec6176cf3..05b33ae57241ad7 100644
|
||||
--- a/pkgs/by-name/ol/ollama/package.nix
|
||||
+++ b/pkgs/by-name/ol/ollama/package.nix
|
||||
@@ -32,13 +32,13 @@
|
||||
let
|
||||
pname = "ollama";
|
||||
# don't forget to invalidate all hashes each update
|
||||
- version = "0.2.7";
|
||||
+ version = "0.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ollama";
|
||||
repo = "ollama";
|
||||
rev = "v${version}";
|
||||
- hash = "sha256-YHBGS615dxz6pZR+8awMinp+ZRf3J8Re5BVeDEIyt2E=";
|
||||
+ hash = "sha256-uir/GoFs0nhhHpznyYkwVjAUWxwjWmGZ7liU2htyQ04=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -52,11 +52,11 @@ let
|
||||
(preparePatch "02-clip-log.diff" "sha256-rMWbl3QgrPlhisTeHwD7EnGRJyOhLB4UeS7rqa0tdXM=")
|
||||
(preparePatch "03-load_exception.diff" "sha256-NJkT/k8Mf8HcEMb0XkaLmyUNKV3T+384JRPnmwDI/sk=")
|
||||
(preparePatch "04-metal.diff" "sha256-bPBCfoT3EjZPjWKfCzh0pnCUbM/fGTj37yOaQr+QxQ4=")
|
||||
- (preparePatch "05-default-pretokenizer.diff" "sha256-50+mzQBQZmYEhYvARHw/dliH0M/gDOYm2uy/yJupDF4=")
|
||||
- (preparePatch "06-qwen2.diff" "sha256-FdDqEIblPy47z3yavKUnaV93Yk+3oboEzj4vHq+R66M=")
|
||||
- (preparePatch "07-embeddings.diff" "sha256-lqg2SI0OapD9LCoAG6MJW6HIHXEmCTv7P75rE9yq/Mo=")
|
||||
- (preparePatch "08-clip-unicode.diff" "sha256-1qMJoXhDewxsqPbmi+/7xILQfGaybZDyXc5eH0winL8=")
|
||||
- (preparePatch "09-pooling.diff" "sha256-7meKWbr06lbVrtxau0AU9BwJ88Z9svwtDXhmHI+hYBk=")
|
||||
+ (preparePatch "05-default-pretokenizer.diff" "sha256-Mgx+xi59rz3d5yEXp90QPQMiUr9InlA0Wo1mOSuRcec=")
|
||||
+ (preparePatch "06-embeddings.diff" "sha256-lqg2SI0OapD9LCoAG6MJW6HIHXEmCTv7P75rE9yq/Mo=")
|
||||
+ (preparePatch "07-clip-unicode.diff" "sha256-1qMJoXhDewxsqPbmi+/7xILQfGaybZDyXc5eH0winL8=")
|
||||
+ (preparePatch "08-pooling.diff" "sha256-7meKWbr06lbVrtxau0AU9BwJ88Z9svwtDXhmHI+hYBk=")
|
||||
+ (preparePatch "09-lora.diff" "sha256-HVDYiqNkuWO9K7aIiT73iiMj5lxMsJC1oqIG4madAPk=")
|
||||
];
|
||||
|
||||
preparePatch = patch: hash: fetchpatch {
|
||||
|
||||
From ef6a3aec105ecdf21fb3d0d92f1e22f80419d82a Mon Sep 17 00:00:00 2001
|
||||
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
|
||||
Date: Tue, 23 Jul 2024 10:29:48 +0200
|
||||
Subject: [PATCH 2/4] ollama: reformat with `nixfmt-rfc-style`
|
||||
|
||||
---
|
||||
.git-blame-ignore-revs | 3 +
|
||||
pkgs/by-name/ol/ollama/package.nix | 320 +++++++++++++++--------------
|
||||
2 files changed, 169 insertions(+), 154 deletions(-)
|
||||
|
||||
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
|
||||
index 012889bb2e8247f..ae22633837b6fe5 100644
|
||||
--- a/.git-blame-ignore-revs
|
||||
+++ b/.git-blame-ignore-revs
|
||||
@@ -141,3 +141,6 @@ acd0e3898feb321cb9a71a0fd376f1157d0f4553
|
||||
|
||||
# poptracker: format with nixfmt-rfc-style (#326697)
|
||||
ff5c8f6cc3d1f2e017e86d50965c14b71f00567b
|
||||
+
|
||||
+# ollama: reformat with nixfmt-rfc-style (#329353)
|
||||
+8f91c4628a6b2e3f486c150c15b7407214d9b9de
|
||||
diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
|
||||
index 05b33ae57241ad7..7b1f2c88e92e591 100644
|
||||
--- a/pkgs/by-name/ol/ollama/package.nix
|
||||
+++ b/pkgs/by-name/ol/ollama/package.nix
|
||||
@@ -1,32 +1,33 @@
|
||||
-{ lib
|
||||
-, buildGoModule
|
||||
-, fetchFromGitHub
|
||||
-, fetchpatch
|
||||
-, buildEnv
|
||||
-, linkFarm
|
||||
-, overrideCC
|
||||
-, makeWrapper
|
||||
-, stdenv
|
||||
-, addDriverRunpath
|
||||
-
|
||||
-, cmake
|
||||
-, gcc12
|
||||
-, clblast
|
||||
-, libdrm
|
||||
-, rocmPackages
|
||||
-, cudaPackages
|
||||
-, darwin
|
||||
-, autoAddDriverRunpath
|
||||
-
|
||||
-, nixosTests
|
||||
-, testers
|
||||
-, ollama
|
||||
-, ollama-rocm
|
||||
-, ollama-cuda
|
||||
-
|
||||
-, config
|
||||
+{
|
||||
+ lib,
|
||||
+ buildGoModule,
|
||||
+ fetchFromGitHub,
|
||||
+ fetchpatch,
|
||||
+ buildEnv,
|
||||
+ linkFarm,
|
||||
+ overrideCC,
|
||||
+ makeWrapper,
|
||||
+ stdenv,
|
||||
+ addDriverRunpath,
|
||||
+
|
||||
+ cmake,
|
||||
+ gcc12,
|
||||
+ clblast,
|
||||
+ libdrm,
|
||||
+ rocmPackages,
|
||||
+ cudaPackages,
|
||||
+ darwin,
|
||||
+ autoAddDriverRunpath,
|
||||
+
|
||||
+ nixosTests,
|
||||
+ testers,
|
||||
+ ollama,
|
||||
+ ollama-rocm,
|
||||
+ ollama-cuda,
|
||||
+
|
||||
+ config,
|
||||
# one of `[ null false "rocm" "cuda" ]`
|
||||
-, acceleration ? null
|
||||
+ acceleration ? null,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -59,25 +60,28 @@ let
|
||||
(preparePatch "09-lora.diff" "sha256-HVDYiqNkuWO9K7aIiT73iiMj5lxMsJC1oqIG4madAPk=")
|
||||
];
|
||||
|
||||
- preparePatch = patch: hash: fetchpatch {
|
||||
- url = "file://${src}/llm/patches/${patch}";
|
||||
- inherit hash;
|
||||
- stripLen = 1;
|
||||
- extraPrefix = "llm/llama.cpp/";
|
||||
- };
|
||||
-
|
||||
+ preparePatch =
|
||||
+ patch: hash:
|
||||
+ fetchpatch {
|
||||
+ url = "file://${src}/llm/patches/${patch}";
|
||||
+ inherit hash;
|
||||
+ stripLen = 1;
|
||||
+ extraPrefix = "llm/llama.cpp/";
|
||||
+ };
|
||||
|
||||
- accelIsValid = builtins.elem acceleration [ null false "rocm" "cuda" ];
|
||||
- validateFallback = lib.warnIf (config.rocmSupport && config.cudaSupport)
|
||||
- (lib.concatStrings [
|
||||
- "both `nixpkgs.config.rocmSupport` and `nixpkgs.config.cudaSupport` are enabled, "
|
||||
- "but they are mutually exclusive; falling back to cpu"
|
||||
- ])
|
||||
- (!(config.rocmSupport && config.cudaSupport));
|
||||
- shouldEnable = assert accelIsValid;
|
||||
- mode: fallback:
|
||||
- (acceleration == mode)
|
||||
- || (fallback && acceleration == null && validateFallback);
|
||||
+ accelIsValid = builtins.elem acceleration [
|
||||
+ null
|
||||
+ false
|
||||
+ "rocm"
|
||||
+ "cuda"
|
||||
+ ];
|
||||
+ validateFallback = lib.warnIf (config.rocmSupport && config.cudaSupport) (lib.concatStrings [
|
||||
+ "both `nixpkgs.config.rocmSupport` and `nixpkgs.config.cudaSupport` are enabled, "
|
||||
+ "but they are mutually exclusive; falling back to cpu"
|
||||
+ ]) (!(config.rocmSupport && config.cudaSupport));
|
||||
+ shouldEnable =
|
||||
+ assert accelIsValid;
|
||||
+ mode: fallback: (acceleration == mode) || (fallback && acceleration == null && validateFallback);
|
||||
|
||||
rocmRequested = shouldEnable "rocm" config.rocmSupport;
|
||||
cudaRequested = shouldEnable "cuda" config.cudaSupport;
|
||||
@@ -85,7 +89,6 @@ let
|
||||
enableRocm = rocmRequested && stdenv.isLinux;
|
||||
enableCuda = cudaRequested && stdenv.isLinux;
|
||||
|
||||
-
|
||||
rocmLibs = [
|
||||
rocmPackages.clr
|
||||
rocmPackages.hipblas
|
||||
@@ -95,9 +98,7 @@ let
|
||||
rocmPackages.rocm-device-libs
|
||||
rocmPackages.rocm-smi
|
||||
];
|
||||
- rocmClang = linkFarm "rocm-clang" {
|
||||
- llvm = rocmPackages.llvm.clang;
|
||||
- };
|
||||
+ rocmClang = linkFarm "rocm-clang" { llvm = rocmPackages.llvm.clang; };
|
||||
rocmPath = buildEnv {
|
||||
name = "rocm-path";
|
||||
paths = rocmLibs ++ [ rocmClang ];
|
||||
@@ -121,114 +122,125 @@ let
|
||||
appleFrameworks.MetalPerformanceShaders
|
||||
];
|
||||
|
||||
- wrapperOptions = [
|
||||
- # ollama embeds llama-cpp binaries which actually run the ai models
|
||||
- # these llama-cpp binaries are unaffected by the ollama binary's DT_RUNPATH
|
||||
- # LD_LIBRARY_PATH is temporarily required to use the gpu
|
||||
- # until these llama-cpp binaries can have their runpath patched
|
||||
- "--suffix LD_LIBRARY_PATH : '${addDriverRunpath.driverLink}/lib'"
|
||||
- ] ++ lib.optionals enableRocm [
|
||||
- "--suffix LD_LIBRARY_PATH : '${rocmPath}/lib'"
|
||||
- "--set-default HIP_PATH '${rocmPath}'"
|
||||
- ];
|
||||
+ wrapperOptions =
|
||||
+ [
|
||||
+ # ollama embeds llama-cpp binaries which actually run the ai models
|
||||
+ # these llama-cpp binaries are unaffected by the ollama binary's DT_RUNPATH
|
||||
+ # LD_LIBRARY_PATH is temporarily required to use the gpu
|
||||
+ # until these llama-cpp binaries can have their runpath patched
|
||||
+ "--suffix LD_LIBRARY_PATH : '${addDriverRunpath.driverLink}/lib'"
|
||||
+ ]
|
||||
+ ++ lib.optionals enableRocm [
|
||||
+ "--suffix LD_LIBRARY_PATH : '${rocmPath}/lib'"
|
||||
+ "--set-default HIP_PATH '${rocmPath}'"
|
||||
+ ];
|
||||
wrapperArgs = builtins.concatStringsSep " " wrapperOptions;
|
||||
|
||||
-
|
||||
goBuild =
|
||||
- if enableCuda then
|
||||
- buildGoModule.override { stdenv = overrideCC stdenv gcc12; }
|
||||
- else
|
||||
- buildGoModule;
|
||||
+ if enableCuda then buildGoModule.override { stdenv = overrideCC stdenv gcc12; } else buildGoModule;
|
||||
inherit (lib) licenses platforms maintainers;
|
||||
in
|
||||
-goBuild ((lib.optionalAttrs enableRocm {
|
||||
- ROCM_PATH = rocmPath;
|
||||
- CLBlast_DIR = "${clblast}/lib/cmake/CLBlast";
|
||||
-}) // (lib.optionalAttrs enableCuda {
|
||||
- CUDA_LIB_DIR = "${cudaToolkit}/lib";
|
||||
-}) // {
|
||||
- inherit pname version src vendorHash;
|
||||
-
|
||||
- nativeBuildInputs = [
|
||||
- cmake
|
||||
- ] ++ lib.optionals enableRocm [
|
||||
- rocmPackages.llvm.bintools
|
||||
- ] ++ lib.optionals enableCuda [
|
||||
- cudaPackages.cuda_nvcc
|
||||
- ] ++ lib.optionals (enableRocm || enableCuda) [
|
||||
- makeWrapper
|
||||
- autoAddDriverRunpath
|
||||
- ] ++ lib.optionals stdenv.isDarwin
|
||||
- metalFrameworks;
|
||||
-
|
||||
- buildInputs = lib.optionals enableRocm
|
||||
- (rocmLibs ++ [ libdrm ])
|
||||
- ++ lib.optionals enableCuda [
|
||||
- cudaPackages.cuda_cudart
|
||||
- cudaPackages.cuda_cccl
|
||||
- cudaPackages.libcublas
|
||||
- ] ++ lib.optionals stdenv.isDarwin
|
||||
- metalFrameworks;
|
||||
-
|
||||
- patches = [
|
||||
- # disable uses of `git` in the `go generate` script
|
||||
- # ollama's build script assumes the source is a git repo, but nix removes the git directory
|
||||
- # this also disables necessary patches contained in `ollama/llm/patches/`
|
||||
- # those patches are added to `llamacppPatches`, and reapplied here in the patch phase
|
||||
- ./disable-git.patch
|
||||
- # disable a check that unnecessarily exits compilation during rocm builds
|
||||
- # since `rocmPath` is in `LD_LIBRARY_PATH`, ollama uses rocm correctly
|
||||
- ./disable-lib-check.patch
|
||||
- ] ++ llamacppPatches;
|
||||
- postPatch = ''
|
||||
- # replace inaccurate version number with actual release version
|
||||
- substituteInPlace version/version.go --replace-fail 0.0.0 '${version}'
|
||||
- '';
|
||||
- preBuild = ''
|
||||
- # disable uses of `git`, since nix removes the git directory
|
||||
- export OLLAMA_SKIP_PATCHING=true
|
||||
- # build llama.cpp libraries for ollama
|
||||
- go generate ./...
|
||||
- '';
|
||||
- postFixup = ''
|
||||
- # the app doesn't appear functional at the moment, so hide it
|
||||
- mv "$out/bin/app" "$out/bin/.ollama-app"
|
||||
- '' + lib.optionalString (enableRocm || enableCuda) ''
|
||||
- # expose runtime libraries necessary to use the gpu
|
||||
- wrapProgram "$out/bin/ollama" ${wrapperArgs}
|
||||
- '';
|
||||
-
|
||||
- ldflags = [
|
||||
- "-s"
|
||||
- "-w"
|
||||
- "-X=github.com/ollama/ollama/version.Version=${version}"
|
||||
- "-X=github.com/ollama/ollama/server.mode=release"
|
||||
- ];
|
||||
+goBuild (
|
||||
+ (lib.optionalAttrs enableRocm {
|
||||
+ ROCM_PATH = rocmPath;
|
||||
+ CLBlast_DIR = "${clblast}/lib/cmake/CLBlast";
|
||||
+ })
|
||||
+ // (lib.optionalAttrs enableCuda { CUDA_LIB_DIR = "${cudaToolkit}/lib"; })
|
||||
+ // {
|
||||
+ inherit
|
||||
+ pname
|
||||
+ version
|
||||
+ src
|
||||
+ vendorHash
|
||||
+ ;
|
||||
+
|
||||
+ nativeBuildInputs =
|
||||
+ [ cmake ]
|
||||
+ ++ lib.optionals enableRocm [ rocmPackages.llvm.bintools ]
|
||||
+ ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ]
|
||||
+ ++ lib.optionals (enableRocm || enableCuda) [
|
||||
+ makeWrapper
|
||||
+ autoAddDriverRunpath
|
||||
+ ]
|
||||
+ ++ lib.optionals stdenv.isDarwin metalFrameworks;
|
||||
+
|
||||
+ buildInputs =
|
||||
+ lib.optionals enableRocm (rocmLibs ++ [ libdrm ])
|
||||
+ ++ lib.optionals enableCuda [
|
||||
+ cudaPackages.cuda_cudart
|
||||
+ cudaPackages.cuda_cccl
|
||||
+ cudaPackages.libcublas
|
||||
+ ]
|
||||
+ ++ lib.optionals stdenv.isDarwin metalFrameworks;
|
||||
+
|
||||
+ patches = [
|
||||
+ # disable uses of `git` in the `go generate` script
|
||||
+ # ollama's build script assumes the source is a git repo, but nix removes the git directory
|
||||
+ # this also disables necessary patches contained in `ollama/llm/patches/`
|
||||
+ # those patches are added to `llamacppPatches`, and reapplied here in the patch phase
|
||||
+ ./disable-git.patch
|
||||
+ # disable a check that unnecessarily exits compilation during rocm builds
|
||||
+ # since `rocmPath` is in `LD_LIBRARY_PATH`, ollama uses rocm correctly
|
||||
+ ./disable-lib-check.patch
|
||||
+ ] ++ llamacppPatches;
|
||||
+ postPatch = ''
|
||||
+ # replace inaccurate version number with actual release version
|
||||
+ substituteInPlace version/version.go --replace-fail 0.0.0 '${version}'
|
||||
+ '';
|
||||
+ preBuild = ''
|
||||
+ # disable uses of `git`, since nix removes the git directory
|
||||
+ export OLLAMA_SKIP_PATCHING=true
|
||||
+ # build llama.cpp libraries for ollama
|
||||
+ go generate ./...
|
||||
+ '';
|
||||
+ postFixup =
|
||||
+ ''
|
||||
+ # the app doesn't appear functional at the moment, so hide it
|
||||
+ mv "$out/bin/app" "$out/bin/.ollama-app"
|
||||
+ ''
|
||||
+ + lib.optionalString (enableRocm || enableCuda) ''
|
||||
+ # expose runtime libraries necessary to use the gpu
|
||||
+ wrapProgram "$out/bin/ollama" ${wrapperArgs}
|
||||
+ '';
|
||||
+
|
||||
+ ldflags = [
|
||||
+ "-s"
|
||||
+ "-w"
|
||||
+ "-X=github.com/ollama/ollama/version.Version=${version}"
|
||||
+ "-X=github.com/ollama/ollama/server.mode=release"
|
||||
+ ];
|
||||
|
||||
- passthru.tests = {
|
||||
- inherit ollama;
|
||||
- service = nixosTests.ollama;
|
||||
- version = testers.testVersion {
|
||||
- inherit version;
|
||||
- package = ollama;
|
||||
+ passthru.tests =
|
||||
+ {
|
||||
+ inherit ollama;
|
||||
+ service = nixosTests.ollama;
|
||||
+ version = testers.testVersion {
|
||||
+ inherit version;
|
||||
+ package = ollama;
|
||||
+ };
|
||||
+ }
|
||||
+ // lib.optionalAttrs stdenv.isLinux {
|
||||
+ inherit ollama-rocm ollama-cuda;
|
||||
+ service-cuda = nixosTests.ollama-cuda;
|
||||
+ service-rocm = nixosTests.ollama-rocm;
|
||||
+ };
|
||||
+
|
||||
+ meta = {
|
||||
+ description =
|
||||
+ "Get up and running with large language models locally"
|
||||
+ + lib.optionalString rocmRequested ", using ROCm for AMD GPU acceleration"
|
||||
+ + lib.optionalString cudaRequested ", using CUDA for NVIDIA GPU acceleration";
|
||||
+ homepage = "https://github.com/ollama/ollama";
|
||||
+ changelog = "https://github.com/ollama/ollama/releases/tag/v${version}";
|
||||
+ license = licenses.mit;
|
||||
+ platforms = if (rocmRequested || cudaRequested) then platforms.linux else platforms.unix;
|
||||
+ mainProgram = "ollama";
|
||||
+ maintainers = with maintainers; [
|
||||
+ abysssol
|
||||
+ dit7ya
|
||||
+ elohmeier
|
||||
+ roydubnium
|
||||
+ ];
|
||||
};
|
||||
- } // lib.optionalAttrs stdenv.isLinux {
|
||||
- inherit ollama-rocm ollama-cuda;
|
||||
- service-cuda = nixosTests.ollama-cuda;
|
||||
- service-rocm = nixosTests.ollama-rocm;
|
||||
- };
|
||||
-
|
||||
- meta = {
|
||||
- description = "Get up and running with large language models locally"
|
||||
- + lib.optionalString rocmRequested ", using ROCm for AMD GPU acceleration"
|
||||
- + lib.optionalString cudaRequested ", using CUDA for NVIDIA GPU acceleration";
|
||||
- homepage = "https://github.com/ollama/ollama";
|
||||
- changelog = "https://github.com/ollama/ollama/releases/tag/v${version}";
|
||||
- license = licenses.mit;
|
||||
- platforms =
|
||||
- if (rocmRequested || cudaRequested) then platforms.linux
|
||||
- else platforms.unix;
|
||||
- mainProgram = "ollama";
|
||||
- maintainers = with maintainers; [ abysssol dit7ya elohmeier roydubnium ];
|
||||
- };
|
||||
-})
|
||||
+ }
|
||||
+)
|
||||
|
||||
From d86d9340c5314a10d0ba3e7ef498d108def03538 Mon Sep 17 00:00:00 2001
|
||||
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
|
||||
Date: Tue, 23 Jul 2024 11:08:55 +0200
|
||||
Subject: [PATCH 3/4] ollama: move the assert after the top level parameters
|
||||
|
||||
---
|
||||
pkgs/by-name/ol/ollama/package.nix | 14 +++++++-------
|
||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
|
||||
index 7b1f2c88e92e591..c325192a583bbe7 100644
|
||||
--- a/pkgs/by-name/ol/ollama/package.nix
|
||||
+++ b/pkgs/by-name/ol/ollama/package.nix
|
||||
@@ -30,6 +30,13 @@
|
||||
acceleration ? null,
|
||||
}:
|
||||
|
||||
+assert builtins.elem acceleration [
|
||||
+ null
|
||||
+ false
|
||||
+ "rocm"
|
||||
+ "cuda"
|
||||
+];
|
||||
+
|
||||
let
|
||||
pname = "ollama";
|
||||
# don't forget to invalidate all hashes each update
|
||||
@@ -69,18 +76,11 @@ let
|
||||
extraPrefix = "llm/llama.cpp/";
|
||||
};
|
||||
|
||||
- accelIsValid = builtins.elem acceleration [
|
||||
- null
|
||||
- false
|
||||
- "rocm"
|
||||
- "cuda"
|
||||
- ];
|
||||
validateFallback = lib.warnIf (config.rocmSupport && config.cudaSupport) (lib.concatStrings [
|
||||
"both `nixpkgs.config.rocmSupport` and `nixpkgs.config.cudaSupport` are enabled, "
|
||||
"but they are mutually exclusive; falling back to cpu"
|
||||
]) (!(config.rocmSupport && config.cudaSupport));
|
||||
shouldEnable =
|
||||
- assert accelIsValid;
|
||||
mode: fallback: (acceleration == mode) || (fallback && acceleration == null && validateFallback);
|
||||
|
||||
rocmRequested = shouldEnable "rocm" config.rocmSupport;
|
||||
|
||||
From 1b3b0049526c02ef652b2bc6bdca5042c6a59f31 Mon Sep 17 00:00:00 2001
|
||||
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
|
||||
Date: Tue, 23 Jul 2024 11:51:43 +0200
|
||||
Subject: [PATCH 4/4] ollama: replace variable with `with` keyword
|
||||
|
||||
---
|
||||
pkgs/by-name/ol/ollama/package.nix | 11 +++++------
|
||||
1 file changed, 5 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
|
||||
index c325192a583bbe7..a1f4dcc2062923f 100644
|
||||
--- a/pkgs/by-name/ol/ollama/package.nix
|
||||
+++ b/pkgs/by-name/ol/ollama/package.nix
|
||||
@@ -114,12 +114,11 @@ let
|
||||
];
|
||||
};
|
||||
|
||||
- appleFrameworks = darwin.apple_sdk_11_0.frameworks;
|
||||
- metalFrameworks = [
|
||||
- appleFrameworks.Accelerate
|
||||
- appleFrameworks.Metal
|
||||
- appleFrameworks.MetalKit
|
||||
- appleFrameworks.MetalPerformanceShaders
|
||||
+ metalFrameworks = with darwin.apple_sdk_11_0.frameworks; [
|
||||
+ Accelerate
|
||||
+ Metal
|
||||
+ MetalKit
|
||||
+ MetalPerformanceShaders
|
||||
];
|
||||
|
||||
wrapperOptions =
|
||||
28
patches/pahole-fix.patch
Normal file
28
patches/pahole-fix.patch
Normal file
@ -0,0 +1,28 @@
|
||||
From b0b178fc293ad71c35d3ac84e8ac856bd0d3492b Mon Sep 17 00:00:00 2001
|
||||
From: Dominique Martinet <asmadeus@codewreck.org>
|
||||
Date: Fri, 2 Aug 2024 04:34:00 +0900
|
||||
Subject: [PATCH] pahole: fix clang kernel build
|
||||
|
||||
This should fix clang builds for real this time
|
||||
|
||||
Reported-by: PedroHLC <root@pedrohlc.com>
|
||||
---
|
||||
pkgs/by-name/pa/pahole/package.nix | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/pkgs/by-name/pa/pahole/package.nix b/pkgs/by-name/pa/pahole/package.nix
|
||||
index 14a31958c0e2c14..d82c76eb769c9ef 100644
|
||||
--- a/pkgs/by-name/pa/pahole/package.nix
|
||||
+++ b/pkgs/by-name/pa/pahole/package.nix
|
||||
@@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/acmel/dwarves/commit/6a2b27c0f512619b0e7a769a18a0fb05bb3789a5.patch";
|
||||
hash = "sha256-Le1BAew/a/QKkYNLgSQxEvZ9mEEglUw8URwz1kiheeE=";
|
||||
})
|
||||
+ (fetchpatch {
|
||||
+ name = "fix-clang-btf-generation-bug-2.patch";
|
||||
+ url = "https://github.com/acmel/dwarves/commit/94a01bde592c555b3eb526aeb4c2ad695c5660d8.patch";
|
||||
+ hash = "sha256-SMIxLEBjBkprAqVNX1h7nXxAsgbwvCD/Bz7c1ekwg5w=";
|
||||
+ })
|
||||
];
|
||||
|
||||
# Put libraries in "lib" subdirectory, not top level of $out
|
||||
@ -1,30 +0,0 @@
|
||||
From 2844e6ffb1a680752a0ec7d9615793f00874707f Mon Sep 17 00:00:00 2001
|
||||
From: OPNA2608 <opna2608@protonmail.com>
|
||||
Date: Sun, 21 Jul 2024 15:45:17 +0200
|
||||
Subject: [PATCH] quirc: Fix FTBFS on Linux
|
||||
|
||||
https://github.com/dlbeer/quirc/commit/2c350d8aaf37246e538a2c93b2cce8c78600d2fc already includes a cp of libquirc.so, we can drop the Linux-only postInstall block.
|
||||
---
|
||||
pkgs/tools/graphics/quirc/default.nix | 6 ++----
|
||||
1 file changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix
|
||||
index 938b9c37872f0f..b2d1e795155a35 100644
|
||||
--- a/pkgs/tools/graphics/quirc/default.nix
|
||||
+++ b/pkgs/tools/graphics/quirc/default.nix
|
||||
@@ -50,13 +50,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postInstall = ''
|
||||
# don't install static library
|
||||
rm $out/lib/libquirc.a
|
||||
- '' + (if stdenv.isDarwin then ''
|
||||
+ '' + lib.optionalString stdenv.isDarwin ''
|
||||
# Set absolute install name to avoid the need for DYLD_LIBRARY_PATH
|
||||
dylib=$out/lib/libquirc.${finalAttrs.version}.dylib
|
||||
${stdenv.cc.targetPrefix}install_name_tool -id "$dylib" "$dylib"
|
||||
- '' else ''
|
||||
- ln -s $out/lib/libquirc.so.* $out/lib/libquirc.so
|
||||
- '');
|
||||
+ '';
|
||||
|
||||
meta = {
|
||||
description = "Small QR code decoding library";
|
||||
89
patches/zfs-2.2.5.patch
Normal file
89
patches/zfs-2.2.5.patch
Normal file
@ -0,0 +1,89 @@
|
||||
From 8d0db928289e0d3fd8fbefad0a15b3e6c734fb2e Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Marshall <andrew@johnandrewmarshall.com>
|
||||
Date: Tue, 6 Aug 2024 18:37:12 -0400
|
||||
Subject: [PATCH 1/2] zfs_2_2: 2.2.4 -> 2.2.5
|
||||
|
||||
Diff: https://github.com/openzfs/zfs/compare/zfs-2.2.4...zfs-2.2.5
|
||||
|
||||
Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.2.5
|
||||
---
|
||||
pkgs/os-specific/linux/zfs/2_2.nix | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/pkgs/os-specific/linux/zfs/2_2.nix b/pkgs/os-specific/linux/zfs/2_2.nix
|
||||
index cc4a3490a197f7..b6d99bbcc0065e 100644
|
||||
--- a/pkgs/os-specific/linux/zfs/2_2.nix
|
||||
+++ b/pkgs/os-specific/linux/zfs/2_2.nix
|
||||
@@ -15,12 +15,12 @@ callPackage ./generic.nix args {
|
||||
# this attribute is the correct one for this package.
|
||||
kernelModuleAttribute = "zfs_2_2";
|
||||
# check the release notes for compatible kernels
|
||||
- kernelCompatible = kernel.kernelOlder "6.9";
|
||||
+ kernelCompatible = kernel.kernelOlder "6.11";
|
||||
|
||||
- latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_8;
|
||||
+ latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_10;
|
||||
|
||||
# this package should point to the latest release.
|
||||
- version = "2.2.4";
|
||||
+ version = "2.2.5";
|
||||
|
||||
tests = [
|
||||
nixosTests.zfs.installer
|
||||
@@ -29,5 +29,5 @@ callPackage ./generic.nix args {
|
||||
|
||||
maintainers = with lib.maintainers; [ adamcstephens amarshall ];
|
||||
|
||||
- hash = "sha256-SSp/1Tu1iGx5UDcG4j0k2fnYxK05cdE8gzfSn8DU5Z4=";
|
||||
+ hash = "sha256-BkwcNPk+jX8CXp5xEVrg4THof7o/5j8RY2SY6+IPNTg=";
|
||||
}
|
||||
|
||||
From fde7c3afb37e7a9d4be39e112b4b8f0bd6f75352 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Marshall <andrew@johnandrewmarshall.com>
|
||||
Date: Tue, 6 Aug 2024 18:37:47 -0400
|
||||
Subject: [PATCH 2/2] zfs-unstable: 2.2.4-unstable-2024-07-15 -> 2.2.5
|
||||
|
||||
Patches all appear to be merged into this release.
|
||||
---
|
||||
pkgs/os-specific/linux/zfs/unstable.nix | 24 +++---------------------
|
||||
1 file changed, 3 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix
|
||||
index faf3514dba3e88..d989e2394ce4ed 100644
|
||||
--- a/pkgs/os-specific/linux/zfs/unstable.nix
|
||||
+++ b/pkgs/os-specific/linux/zfs/unstable.nix
|
||||
@@ -23,31 +23,13 @@ callPackage ./generic.nix args {
|
||||
# IMPORTANT: Always use a tagged release candidate or commits from the
|
||||
# zfs-<version>-staging branch, because this is tested by the OpenZFS
|
||||
# maintainers.
|
||||
- version = "2.2.4-unstable-2024-07-15";
|
||||
- rev = "/54ef0fdf60a8e7633c38cb46e1f5bcfcec792f4e";
|
||||
+ version = "2.2.5";
|
||||
+ # rev = "";
|
||||
|
||||
isUnstable = true;
|
||||
tests = [
|
||||
nixosTests.zfs.unstable
|
||||
];
|
||||
|
||||
- # 6.10 patches approved+merged to the default branch, not in staging yet
|
||||
- # https://github.com/openzfs/zfs/pull/16250
|
||||
- extraPatches = [
|
||||
- (fetchpatch {
|
||||
- url = "https://github.com/openzfs/zfs/commit/7ca7bb7fd723a91366ce767aea53c4f5c2d65afb.patch";
|
||||
- hash = "sha256-vUX4lgywh5ox6DjtIfeC90KjbLoW3Ol0rK/L65jOENo=";
|
||||
- })
|
||||
- (fetchpatch {
|
||||
- url = "https://github.com/openzfs/zfs/commit/e951dba48a6330aca9c161c50189f6974e6877f0.patch";
|
||||
- hash = "sha256-A1h0ZLY+nlReBMTlEm3O9kwBqto1cgsZdnJsHpR6hw0=";
|
||||
- })
|
||||
- (fetchpatch {
|
||||
- url = "https://github.com/openzfs/zfs/commit/b409892ae5028965a6fe98dde1346594807e6e45.patch";
|
||||
- hash = "sha256-pW1b8ktglFhwVRapTB5th9UCyjyrPmCVPg53nMENax8=";
|
||||
- })
|
||||
-
|
||||
- ];
|
||||
-
|
||||
- hash = "sha256-7vZeIzA2yDW/gSCcS2AM3+C9qbRIbA9XbCRUxikW2+M=";
|
||||
+ hash = "sha256-BkwcNPk+jX8CXp5xEVrg4THof7o/5j8RY2SY6+IPNTg=";
|
||||
}
|
||||
@ -10,7 +10,8 @@ in {
|
||||
enable = true;
|
||||
host = "127.0.0.1";
|
||||
port = 11434;
|
||||
sandbox = false;
|
||||
user = "ollama";
|
||||
group = "ollama";
|
||||
openFirewall = false;
|
||||
acceleration =
|
||||
if gpu == "amd" then
|
||||
@ -72,18 +73,10 @@ in {
|
||||
environmentFile = config.sops.secrets.searx-env.path;
|
||||
};
|
||||
|
||||
users.groups.ollama = { };
|
||||
users.users.ollama = {
|
||||
description = "ollama user";
|
||||
isSystemUser = true;
|
||||
group = "ollama";
|
||||
extraGroups = [ "video" "render" ];
|
||||
};
|
||||
users.users.ollama.extraGroups = [ "video" "render" ];
|
||||
|
||||
systemd.services.ollama.serviceConfig = {
|
||||
DynamicUser = lib.mkForce false;
|
||||
User = "ollama";
|
||||
Group = "ollama";
|
||||
};
|
||||
systemd.services.open-webui.serviceConfig = {
|
||||
DynamicUser = lib.mkForce false;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user