Compare commits

...

4 commits

Author SHA1 Message Date
Trolli Schmittlauch 77bdc00e95 logseq: move back to upstream nixpkgs 2024-02-25 22:53:31 +01:00
Trolli Schmittlauch e43b1b240a flake.lock: Update
Flake lock file updates:

• Updated input 'nixos-unstable':
    'github:NixOS/nixpkgs/0e74ca98a74bc7270d28838369593635a5db3260' (2024-02-21)
  → 'github:NixOS/nixpkgs/73de017ef2d18a04ac4bfd0c02650007ccb31c2a' (2024-02-24)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/526d051b128b82ae045a70e5ff1adf8e6dafa560' (2024-02-20)
  → 'github:NixOS/nixpkgs/5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b' (2024-02-25)
2024-02-25 22:46:57 +01:00
Trolli Schmittlauch 6f49e60a70 flake.lock: Update
Flake lock file updates:

• Updated input 'nixos-unstable':
    'github:NixOS/nixpkgs/a4d4fe8c5002202493e87ec8dbc91335ff55552c' (2024-02-15)
  → 'github:NixOS/nixpkgs/0e74ca98a74bc7270d28838369593635a5db3260' (2024-02-21)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/c68a9fc85c2cb3a313be6ff40511635544dde8da' (2024-02-15)
  → 'github:NixOS/nixpkgs/526d051b128b82ae045a70e5ff1adf8e6dafa560' (2024-02-20)
2024-02-21 18:57:41 +01:00
Trolli Schmittlauch 346b7afd65 host framenix: linux 6.8-rc4 -> 6.8-rc5
allows dropping the drm buddy patch
2024-02-21 18:57:07 +01:00
4 changed files with 10 additions and 34 deletions

View file

@ -156,22 +156,6 @@
"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": {
@ -206,11 +190,11 @@
},
"nixos-unstable": {
"locked": {
"lastModified": 1707956935,
"narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=",
"lastModified": 1708807242,
"narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c",
"rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a",
"type": "github"
},
"original": {
@ -254,11 +238,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1707978831,
"narHash": "sha256-UblFdWQ2MMZNzD9C/w8+7RjAJ2QIbebbzHUniQ/a44o=",
"lastModified": 1708831307,
"narHash": "sha256-0iL/DuGjiUeck1zEaL+aIe2WvA3/cVhp/SlmTcOZXH4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c68a9fc85c2cb3a313be6ff40511635544dde8da",
"rev": "5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b",
"type": "github"
},
"original": {
@ -318,7 +302,6 @@
"inputs": {
"home-manager": "home-manager",
"lanzaboote": "lanzaboote",
"logseq-fix-nixpkgs": "logseq-fix-nixpkgs",
"mysecrets": "mysecrets",
"nixos-hardware": "nixos-hardware",
"nixos-unstable": "nixos-unstable",

View file

@ -3,7 +3,6 @@
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 = {

View file

@ -43,7 +43,7 @@ let
#(pkgs.pidgin-with-plugins.override {
# plugins = [ pkgs.pidginotr ];})
inputs.logseq-fix-nixpkgs.legacyPackages.${system}.logseq
logseq
# for Hibiscus banking software

View file

@ -24,10 +24,10 @@ in
argsOverride = rec {
src = pkgs.fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
hash = "sha256-sLypPyMhFhamhQOWDIkzZ5cVrWfoZDb3prJaESD6UU0=";
hash = "sha256-cC6UbYUFBkAiD70lBDE94aE4UQ2ryYQftIppJy48Pto=";
};
version = "6.8-rc4";
modDirVersion = "6.8.0-rc4";
version = "6.8-rc5";
modDirVersion = "6.8.0-rc5";
};
});
# revert some commits that introduced the clourful graphics artefacts flickering,
@ -39,12 +39,6 @@ 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 = [