hot-fix atuin

This commit is contained in:
Ingolf Wagner 2024-06-14 10:19:17 +02:00
parent 6d7489aca7
commit 08f480a81a
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
4 changed files with 25 additions and 2 deletions

View file

@ -662,6 +662,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-legacy_2405": {
"locked": {
"lastModified": 1718208800,
"narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "cc54fb41d13736e92229c21627ea4f22199fee6b",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1717284937, "lastModified": 1717284937,
@ -904,6 +920,7 @@
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"nixpkgs-legacy_2211": "nixpkgs-legacy_2211", "nixpkgs-legacy_2211": "nixpkgs-legacy_2211",
"nixpkgs-legacy_2311": "nixpkgs-legacy_2311", "nixpkgs-legacy_2311": "nixpkgs-legacy_2311",
"nixpkgs-legacy_2405": "nixpkgs-legacy_2405",
"overviewer": "overviewer", "overviewer": "overviewer",
"permown": "permown", "permown": "permown",
"polygon-art": "polygon-art", "polygon-art": "polygon-art",

View file

@ -24,6 +24,7 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-legacy_2211.url = "github:nixos/nixpkgs/nixos-22.11"; nixpkgs-legacy_2211.url = "github:nixos/nixpkgs/nixos-22.11";
nixpkgs-legacy_2311.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs-legacy_2311.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs-legacy_2405.url = "github:nixos/nixpkgs/nixos-24.05";
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
nixos-anywhere.url = "github:nix-community/nixos-anywhere"; nixos-anywhere.url = "github:nix-community/nixos-anywhere";
@ -109,6 +110,7 @@
, nixpkgs , nixpkgs
, nixpkgs-legacy_2211 , nixpkgs-legacy_2211
, nixpkgs-legacy_2311 , nixpkgs-legacy_2311
, nixpkgs-legacy_2405
, overviewer , overviewer
, permown , permown
, polygon-art , polygon-art
@ -147,6 +149,10 @@
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
legacy_2405 = import nixpkgs-legacy_2405 {
inherit system;
config.allowUnfree = true;
};
polygon-art = polygon-art.packages.${system}; polygon-art = polygon-art.packages.${system};
landingpage = landingpage.packages.${system}.plain; landingpage = landingpage.packages.${system}.plain;
kmonad = kmonad.packages.${system}.kmonad; kmonad = kmonad.packages.${system}.kmonad;

View file

@ -37,7 +37,7 @@
enableBashIntegration = true; enableBashIntegration = true;
enableZshIntegration = true; enableZshIntegration = true;
#package = pkgs.atuin; #package = pkgs.atuin;
package = pkgs.atuin.overrideAttrs (_old: { package = pkgs.legacy_2405.atuin.overrideAttrs (_old: {
# as cursed as doing mitigations=off in the kernel command line # as cursed as doing mitigations=off in the kernel command line
patches = [ "${assets}/0001-make-atuin-on-zfs-fast-again.patch" ]; patches = [ "${assets}/0001-make-atuin-on-zfs-fast-again.patch" ];
}); });

View file

@ -1,7 +1,7 @@
{ config, pkgs, assets, ... }: { { config, pkgs, assets, ... }: {
services.atuin = { services.atuin = {
enable = true; enable = true;
package = pkgs.atuin.overrideAttrs (_old: { package = pkgs.legacy_2405.atuin.overrideAttrs (_old: {
# as cursed as doing mitigations=off in the kernel command line # as cursed as doing mitigations=off in the kernel command line
patches = [ "${assets}/0001-make-atuin-on-zfs-fast-again.patch" ]; patches = [ "${assets}/0001-make-atuin-on-zfs-fast-again.patch" ];
}); });