about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsefidel <contact@sefidel.net>2024-02-04 21:55:36 +0900
committersefidel <contact@sefidel.net>2024-02-04 21:57:15 +0900
commit29f85f03caa245968d2a7aea447101e7a0d9481b (patch)
treed5fe10c0a780a327475257e364f7d6ae2b7a4dcd
parent7e67e2cfe698ff8a1bb6638d69e33a689377c04a (diff)
downloadnixrc-29f85f03caa245968d2a7aea447101e7a0d9481b.tar.gz
nixrc-29f85f03caa245968d2a7aea447101e7a0d9481b.zip
fix(nixos/kanata): fix invidious mojibake
* This commit overrides crystal to 1.11, which contains fixes for
  crystal-lang/crystal#13703.
-rw-r--r--flake.lock17
-rw-r--r--flake.nix2
-rw-r--r--nixos/default.nix8
3 files changed, 26 insertions, 1 deletions
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;
+      })
+    ];
   };
 }