diff --git a/flake.lock b/flake.lock index 709bb1d..7aff31c 100644 --- a/flake.lock +++ b/flake.lock @@ -156,6 +156,22 @@ "type": "github" } }, + "logseq-fix-nixpkgs": { + "locked": { + "lastModified": 1707316439, + "narHash": "sha256-3dVL8Wk7ECMiQrHVO1ys7FawMLo7iyQJyKG+aie1eaE=", + "owner": "schmittlauch", + "repo": "nixpkgs", + "rev": "6f1431c8e2dfdfdfe25837c2cc94857900153cab", + "type": "github" + }, + "original": { + "owner": "schmittlauch", + "ref": "backport2311-logseq-0.10.5", + "repo": "nixpkgs", + "type": "github" + } + }, "mysecrets": { "flake": false, "locked": { @@ -190,11 +206,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1708807242, - "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", + "lastModified": 1707956935, + "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", + "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c", "type": "github" }, "original": { @@ -238,11 +254,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1708831307, - "narHash": "sha256-0iL/DuGjiUeck1zEaL+aIe2WvA3/cVhp/SlmTcOZXH4=", + "lastModified": 1707978831, + "narHash": "sha256-UblFdWQ2MMZNzD9C/w8+7RjAJ2QIbebbzHUniQ/a44o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b", + "rev": "c68a9fc85c2cb3a313be6ff40511635544dde8da", "type": "github" }, "original": { @@ -302,6 +318,7 @@ "inputs": { "home-manager": "home-manager", "lanzaboote": "lanzaboote", + "logseq-fix-nixpkgs": "logseq-fix-nixpkgs", "mysecrets": "mysecrets", "nixos-hardware": "nixos-hardware", "nixos-unstable": "nixos-unstable", diff --git a/flake.nix b/flake.nix index 0a3a150..bcfb9b6 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; + logseq-fix-nixpkgs.url = "github:schmittlauch/nixpkgs/backport2311-logseq-0.10.5"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { diff --git a/home/home.nix b/home/home.nix index 61231dd..1f42843 100644 --- a/home/home.nix +++ b/home/home.nix @@ -43,7 +43,7 @@ let #(pkgs.pidgin-with-plugins.override { # plugins = [ pkgs.pidginotr ];}) - logseq + inputs.logseq-fix-nixpkgs.legacyPackages.${system}.logseq # for Hibiscus banking software diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 1c9e651..b5375fe 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -24,10 +24,10 @@ in argsOverride = rec { src = pkgs.fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - hash = "sha256-cC6UbYUFBkAiD70lBDE94aE4UQ2ryYQftIppJy48Pto="; + hash = "sha256-sLypPyMhFhamhQOWDIkzZ5cVrWfoZDb3prJaESD6UU0="; }; - version = "6.8-rc5"; - modDirVersion = "6.8.0-rc5"; + version = "6.8-rc4"; + modDirVersion = "6.8.0-rc4"; }; }); # revert some commits that introduced the clourful graphics artefacts flickering, @@ -39,6 +39,12 @@ in hash = "sha256-FeKIQ0eLP4yq1WcMaf8Dp0c+DuqOdeuBQU07dFswzD4="; }; } + {name = "drm/buddy: Fix alloc_range() error handling code"; + patch = pkgs.fetchpatch { + url = "https://cgit.freedesktop.org/drm/drm-misc/patch/?id=8746c6c9dfa31d269c65dd52ab42fde0720b7d91"; + hash = "sha256-Ir7TDLspbYilTJr6aVVb8urIYI2N2vZwI5ayp7laaGw="; + }; + } ]; boot.kernelParams = [