wallust: build now using pinned rustc version

This commit is contained in:
Tigor Hutasuhut 2024-07-10 08:53:11 +07:00
parent a90327617e
commit 5552ca18ae
3 changed files with 19 additions and 5 deletions

View file

@ -37,8 +37,22 @@
url = "github:nix-community/nix-index-database"; url = "github:nix-community/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = inputs @ { self, nur, nixpkgs, home-manager, sops-nix, neovim-nightly-overlay, nix-index-database, ... }: };
outputs =
inputs @ { self
, nur
, nixpkgs
, home-manager
, sops-nix
, neovim-nightly-overlay
, nix-index-database
, rust-overlay
, ...
}:
let let
commonModules = [ commonModules = [
nur.nixosModules.nur nur.nixosModules.nur
@ -52,6 +66,7 @@
nixpkgs.overlays = [ nixpkgs.overlays = [
neovim-nightly-overlay.overlays.default neovim-nightly-overlay.overlays.default
nur.overlay nur.overlay
rust-overlay.overlays.default
]; ];
} }
{ {
@ -72,7 +87,6 @@
home-manager.sharedModules = [ home-manager.sharedModules = [
nix-index-database.hmModules.nix-index nix-index-database.hmModules.nix-index
inputs.sops-nix.homeManagerModules.sops inputs.sops-nix.homeManagerModules.sops
]; ];
} }
]; ];

View file

@ -4,7 +4,7 @@
, nix-update-script , nix-update-script
, imagemagick , imagemagick
, makeWrapper , makeWrapper
, unstable , pkgs
}: }:
let let
version = "3.0.0-beta"; version = "3.0.0-beta";
@ -23,7 +23,7 @@ rustPlatform.buildRustPackage {
cargoHash = "sha256-dkHS8EOzmn5VLiKP3SMT0ZGAsk2wzvQeioG7NuGGUzA="; cargoHash = "sha256-dkHS8EOzmn5VLiKP3SMT0ZGAsk2wzvQeioG7NuGGUzA=";
nativeBuildInputs = [ makeWrapper unstable.rustc ]; nativeBuildInputs = [ makeWrapper pkgs.rust-bin.stable."1.77.2".default ];
postFixup = '' postFixup = ''
wrapProgram $out/bin/wallust \ wrapProgram $out/bin/wallust \

View file

@ -8,7 +8,7 @@ in
home.packages = [ home.packages = [
pkgs.imagemagick pkgs.imagemagick
# unstable.wallust # unstable.wallust
(pkgs.callPackage ./wallust-build.nix { inherit unstable; }) (pkgs.callPackage ./wallust-build.nix { })
]; ];
home. file.".config/wallust/templates" = { home. file.".config/wallust/templates" = {