pkgs/foot-transparent: get source from npins; derieve version from self

This commit is contained in:
raf 2024-07-28 15:42:36 +03:00
parent efa9172cf2
commit fe1648a7b1
Signed by: NotAShelf
GPG key ID: AF26552424E53993
3 changed files with 30 additions and 8 deletions

View file

@ -17,9 +17,7 @@
nixpkgs, nixpkgs,
flake-parts, flake-parts,
... ...
} @ inputs: let } @ inputs:
pins = import ./npins;
in
flake-parts.lib.mkFlake {inherit inputs self;} { flake-parts.lib.mkFlake {inherit inputs self;} {
systems = import inputs.systems; systems = import inputs.systems;
imports = [flake-parts.flakeModules.easyOverlay]; imports = [flake-parts.flakeModules.easyOverlay];
@ -31,7 +29,13 @@
lib, lib,
... ...
}: let }: let
inherit (builtins) concatStringsSep match;
inherit (lib.attrsets) recursiveUpdate;
inherit (lib.filesystem) packagesFromDirectoryRecursive; inherit (lib.filesystem) packagesFromDirectoryRecursive;
inherit (lib.customisation) callPackageWith;
pins = import ./npins;
date = concatStringsSep "-" (match "(.{4})(.{2})(.{2}).*" self.lastModifiedDate);
in { in {
_module.args.pkgs = import nixpkgs { _module.args.pkgs = import nixpkgs {
inherit system; inherit system;
@ -40,7 +44,7 @@
overlayAttrs = config.packages; overlayAttrs = config.packages;
packages = packagesFromDirectoryRecursive { packages = packagesFromDirectoryRecursive {
callPackage = lib.callPackageWith (pkgs // {inherit pins;}); callPackage = callPackageWith (recursiveUpdate pkgs {inherit pins date;});
directory = ./pkgs; directory = ./pkgs;
}; };

View file

@ -30,6 +30,20 @@
"url": "https://api.github.com/repos/alok8bb/cloneit/tarball/0.1.0", "url": "https://api.github.com/repos/alok8bb/cloneit/tarball/0.1.0",
"hash": "18z4vxrfvyp20kig2s9k5y3034nw39wkj8zzk9qskiisv2ypy90b" "hash": "18z4vxrfvyp20kig2s9k5y3034nw39wkj8zzk9qskiisv2ypy90b"
}, },
"foot": {
"type": "GitRelease",
"repository": {
"type": "Git",
"url": "https://codeberg.org/dnkl/foot.git"
},
"pre_releases": false,
"version_upper_bound": null,
"release_prefix": null,
"version": "1.17.2",
"revision": "ebbc1afc2eaea555698a61ef9e1e127e75d69845",
"url": null,
"hash": "1gi2c3zxyyf3l3wp702yfwxk512yz83rk06wljc7wlkbf1c9msm7"
},
"mov-cli": { "mov-cli": {
"type": "GitRelease", "type": "GitRelease",
"repository": { "repository": {

View file

@ -2,24 +2,28 @@
lib, lib,
fetchFromGitea, fetchFromGitea,
foot, foot,
pins,
date,
... ...
}: }:
foot.overrideAttrs (prev: let foot.overrideAttrs (prev: let
version = "2024-03-14-unstable"; pin = pins.foot;
in { in {
inherit version; pname = "foot-transparent";
version = "0-${date}-unstable";
src = fetchFromGitea { src = fetchFromGitea {
domain = "codeberg.org"; domain = "codeberg.org";
owner = "dnkl"; owner = "dnkl";
repo = "foot"; repo = "foot";
rev = "aea16ba5d2896ef22bf0bea45e5e8142c0ff1c2a"; rev = pin.revision;
hash = "sha256-CeDQriQIbyx3V1l719g3AuhnVVYYc63kA0BQpEFQ26A="; sha256 = pin.hash;
}; };
patches = (prev.patches or []) ++ [./0001-fullscreen-transparency.patch]; patches = (prev.patches or []) ++ [./0001-fullscreen-transparency.patch];
mesonFlags = (prev.mesonFlags or []) ++ ["-Dfullscreen_alpha=true"]; mesonFlags = (prev.mesonFlags or []) ++ ["-Dfullscreen_alpha=true"];
meta = { meta = {
description = "Patched version of Foor terminal emulator that brings back fullscreen transparency";
mainProgram = "foot"; mainProgram = "foot";
maintainers = with lib.maintainers; [NotAShelf]; maintainers = with lib.maintainers; [NotAShelf];
}; };