From 29f85f03caa245968d2a7aea447101e7a0d9481b Mon Sep 17 00:00:00 2001 From: sefidel Date: Sun, 4 Feb 2024 21:55:36 +0900 Subject: fix(nixos/kanata): fix invidious mojibake * This commit overrides crystal to 1.11, which contains fixes for crystal-lang/crystal#13703. --- flake.lock | 17 +++++++++++++++++ flake.nix | 2 ++ nixos/default.nix | 8 +++++++- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 7e995b4..7a97790 100644 --- a/flake.lock +++ b/flake.lock @@ -372,6 +372,22 @@ "type": "github" } }, + "nixpkgs-crystal": { + "locked": { + "lastModified": 1707048676, + "narHash": "sha256-h08T5YCtnOaT4pJC/FSKDOXM08rS68nBdfWQ0PRrZSQ=", + "owner": "sefidel", + "repo": "nixpkgs", + "rev": "fa08aa78c39201c9f93f9bee240910ca1034a774", + "type": "github" + }, + "original": { + "owner": "sefidel", + "ref": "crystal_1_11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "dir": "lib", @@ -446,6 +462,7 @@ "neovim-nightly": "neovim-nightly", "nix-gaming": "nix-gaming", "nixpkgs-2311": "nixpkgs-2311", + "nixpkgs-crystal": "nixpkgs-crystal", "nixpkgs-master": "nixpkgs-master", "nur": "nur", "rust": "rust", diff --git a/flake.nix b/flake.nix index 57472d0..64ddd10 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,8 @@ nixpkgs-master.url = "github:nixos/nixpkgs/master"; nixpkgs-2311.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs-crystal.url = "github:sefidel/nixpkgs/crystal_1_11"; + home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "unstable"; diff --git a/nixos/default.nix b/nixos/default.nix index 8fc1ba7..9e368db 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -1,4 +1,4 @@ -{ self, unstable, ... } @ inputs: +{ self, unstable, nixpkgs-crystal, ... } @ inputs: { alpha = self.lib.mkSystem { @@ -26,5 +26,11 @@ inputs.sops-nix.nixosModules.sops inputs.impermanence.nixosModules.impermanence ]; + overlays = [ + (final: prev: { + inherit (nixpkgs-crystal.legacyPackages.x86_64-linux) + crystal invidious; + }) + ]; }; } -- cgit 1.4.1