mov-cli: drop pin; update to latest revision of v3 from 1.5.7

This commit is contained in:
raf 2024-03-14 14:46:04 +03:00
parent 68969a89bd
commit 5244163a47
No known key found for this signature in database
GPG key ID: 02D1DD3FA08B6B29
3 changed files with 89 additions and 73 deletions

View file

@ -32,15 +32,15 @@
"type": "GitRelease", "type": "GitRelease",
"repository": { "repository": {
"type": "GitHub", "type": "GitHub",
"owner": "notashelf", "owner": "mov-cli",
"repo": "mov-cli" "repo": "mov-cli"
}, },
"pre_releases": false, "pre_releases": false,
"version_upper_bound": null, "version_upper_bound": null,
"version": "v1.5.9", "version": "1.5.7",
"revision": "e84e61f550cb83bd1d8f57414846a0dee8776243", "revision": "47c453d156914c373f3ece05564d04f1e12c41e5",
"url": "https://api.github.com/repos/notashelf/mov-cli/tarball/v1.5.9", "url": "https://api.github.com/repos/mov-cli/mov-cli/tarball/1.5.7",
"hash": "1hyhy5xybn921rlmapd4xxqhl60kyyn9kqfhzml4l2k8b962f81y" "hash": "08gc8x80df6d8nxraqh531q68s7kjhs921ndcg7virl1njv5k61q"
}, },
"nixpkgs": { "nixpkgs": {
"type": "Channel", "type": "Channel",

View file

@ -1,8 +1,4 @@
{ {inputs, ...}: {
inputs,
self,
...
}: {
systems = ["x86_64-linux"]; systems = ["x86_64-linux"];
imports = [inputs.flake-parts.flakeModules.easyOverlay]; imports = [inputs.flake-parts.flakeModules.easyOverlay];
@ -19,35 +15,40 @@
}; };
packages = let packages = let
inherit (pkgs) callPackage foot alejandra fetchFromGitea; inherit (pkgs) callPackage fetchFromGitea foot alejandra;
pins = import ../npins; pins = import ../npins;
mkPackage = path: {__functor = self: self.override;} // (callPackage path {inherit pins;}); mkPackage = path: {__functor = self: self.override;} // (callPackage path {inherit pins;});
in { in {
# packages that follow npins entries /*
# they can be updated via npins packages that follow npins entries
they can be updated via npins
*/
ani-cli = mkPackage ./ani-cli; ani-cli = mkPackage ./ani-cli;
rat = mkPackage ./rat; rat = mkPackage ./rat;
mov-cli = mkPackage ./mov-cli;
rofi-calc-wayland = mkPackage ./rofi-calc-wayland; rofi-calc-wayland = mkPackage ./rofi-calc-wayland;
rofi-emoji-wayland = mkPackage ./rofi-emoji-wayland; rofi-emoji-wayland = mkPackage ./rofi-emoji-wayland;
# static packages /*
# need manual intervention with each update static packages
need manual intervention with each update
*/
mov-cli = callPackage ./mov-cli {};
cloneit = callPackage ./cloneit {}; cloneit = callPackage ./cloneit {};
headscale-ui = callPackage ./headscale-ui {}; headscale-ui = callPackage ./headscale-ui {};
mastodon-bird-ui = callPackage ./mastodon-bird-ui {}; mastodon-bird-ui = callPackage ./mastodon-bird-ui {};
reposilite-bin = callPackage ./reposilite-bin { reposilite-bin = callPackage ./reposilite-bin {
javaJdk = pkgs.openjdk17_headless; javaJdk = pkgs.openjdk_headless;
}; };
# patched packages /*
patched packages
patches packages take a package from nixpkgs and patch it to suit my own needs
*/
foot-transparent = foot.overrideAttrs (prev: let foot-transparent = foot.overrideAttrs (prev: let
version = "2024-03-14-unstable"; version = "2024-03-14-unstable";
in { in {
inherit version; inherit version;
src = fetchFromGitea { src = fetchFromGitea {
domain = "codeberg.org"; domain = "codeberg.org";
owner = "dnkl"; owner = "dnkl";
@ -56,9 +57,10 @@
hash = "sha256-Pp3/cNELRYmTOQrJgHX6c+t0QkxEjoly0TLMKVj3H0E="; hash = "sha256-Pp3/cNELRYmTOQrJgHX6c+t0QkxEjoly0TLMKVj3H0E=";
}; };
mesonFlags = (prev.mesonFlags or []) ++ ["-Dfullscreen_alpha=true"];
patches = (prev.patches or []) ++ [../patches/0001-foot-transparent.patch]; patches = (prev.patches or []) ++ [../patches/0001-foot-transparent.patch];
mainProgram = "foot"; mesonFlags = (prev.mesonFlags or []) ++ ["-Dfullscreen_alpha=true"];
meta.mainProgram = "foot";
}); });
alejandra-no-ads = alejandra.overrideAttrs (prev: { alejandra-no-ads = alejandra.overrideAttrs (prev: {
@ -68,7 +70,6 @@
# override gnome-control-center to trick it into thinking we're running gnome # override gnome-control-center to trick it into thinking we're running gnome
# <https://github.com/NixOS/nixpkgs/issues/230493> # <https://github.com/NixOS/nixpkgs/issues/230493>
# <https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/736> # <https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/736>
# get overriden idiot
gccn-wrapped = pkgs.gnome.gnome-control-center.overrideAttrs (prev: { gccn-wrapped = pkgs.gnome.gnome-control-center.overrideAttrs (prev: {
# gnome-control-center does not start without XDG_CURRENT_DESKTOP=gnome # gnome-control-center does not start without XDG_CURRENT_DESKTOP=gnome
preFixup = preFixup =

View file

@ -1,48 +1,63 @@
{ {
lib, lib,
python3Packages,
fetchFromGitHub, fetchFromGitHub,
fetchPypi, # python
pins, python3,
}: let # runtime dependencies
pin = pins.mov-cli; ffmpeg,
in fzf,
python3Packages.buildPythonPackage { mpv,
format = "pyproject"; }:
python3.pkgs.buildPythonPackage {
pname = "mov-cli"; pname = "mov-cli";
inherit (pin) version; version = "2024-03-14-unstable";
pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
inherit (pin.repository) owner repo; owner = "mov-cli";
sha256 = pin.hash; repo = "mov-cli";
rev = pin.revision; rev = "620c46a4426cedda1b8cd4739c8ab3faeccae187";
hash = "sha256-l2CwHbvtRZ+tktwF3+zJj4KM4tCN0sRf/o654FWs0C4=";
}; };
propagatedBuildInputs = with python3Packages; [ makeWrapperArgs = let
poetry-core binPath = lib.makeBinPath [
pycryptodome ffmpeg
lxml fzf
six mpv
];
in [
"--prefix PATH : ${binPath}"
];
propagatedBuildInputs = with python3.pkgs; [
beautifulsoup4 beautifulsoup4
click
colorama
httpx
krfzf-py
lxml
poetry-core
pycrypto
setuptools
six
tldextract tldextract
(httpx.overrideAttrs (_: { toml
src = fetchFromGitHub { inquirer
owner = "encode"; unidecode
repo = "httpx"; ];
rev = "refs/tags/0.26.0";
hash = "sha256-qMMx1CYu2/yH4NRvZFzJOflAPIbcvMYJqU4r+chuzl0="; build-system = [
}; python3.pkgs.setuptools-scm
})) ];
(buildPythonPackage (let
pname = "krfzf_py"; nativeBuildInputs = [
version = "0.0.4"; python3.pkgs.pythonRelaxDepsHook
in { ];
inherit pname version;
src = fetchPypi { pythonRelaxDeps = [
inherit pname version; "httpx"
sha256 = "sha256-W0wpR1/HRrtYC3vqEwh+Jwkgwnfa49LCFIArOXaSPCE="; "tldextract"
};
}))
]; ];
meta = { meta = {
@ -51,4 +66,4 @@ in
license = lib.licenses.gpl3Only; license = lib.licenses.gpl3Only;
mainProgram = "mov-cli"; mainProgram = "mov-cli";
}; };
} }