nix: remove u2c and partyfuse packages
The main copyparty package has u2c and partyfuse, so these packages are redundant now
This commit is contained in:
parent
76bf9d068a
commit
f013429f06
@ -1,26 +0,0 @@
|
|||||||
{
|
|
||||||
stdenvNoCC,
|
|
||||||
copyparty,
|
|
||||||
python3,
|
|
||||||
makeBinaryWrapper,
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
python = python3.withPackages (p: [ p.fusepy ]);
|
|
||||||
in
|
|
||||||
stdenvNoCC.mkDerivation {
|
|
||||||
pname = "partyfuse";
|
|
||||||
inherit (copyparty) version meta;
|
|
||||||
src = ../../../..;
|
|
||||||
|
|
||||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
runHook preInstall
|
|
||||||
|
|
||||||
install -Dm444 bin/partyfuse.py -t $out/share/copyparty
|
|
||||||
makeWrapper ${python.interpreter} $out/bin/partyfuse \
|
|
||||||
--add-flag $out/share/copyparty/partyfuse.py
|
|
||||||
|
|
||||||
runHook postInstall
|
|
||||||
'';
|
|
||||||
}
|
|
@ -1,24 +0,0 @@
|
|||||||
{
|
|
||||||
stdenvNoCC,
|
|
||||||
copyparty,
|
|
||||||
python312,
|
|
||||||
makeBinaryWrapper,
|
|
||||||
}:
|
|
||||||
stdenvNoCC.mkDerivation {
|
|
||||||
pname = "u2c";
|
|
||||||
inherit (copyparty) version meta;
|
|
||||||
src = ../../../..;
|
|
||||||
|
|
||||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
runHook preInstall
|
|
||||||
|
|
||||||
install -Dm444 bin/u2c.py -t $out/share/copyparty
|
|
||||||
mkdir $out/bin
|
|
||||||
makeWrapper ${python312.interpreter} $out/bin/u2c \
|
|
||||||
--add-flag $out/share/copyparty/u2c.py
|
|
||||||
|
|
||||||
runHook postInstall
|
|
||||||
'';
|
|
||||||
}
|
|
12
flake.nix
12
flake.nix
@ -12,18 +12,10 @@
|
|||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
nixosModules.default = ./contrib/nixos/modules/copyparty.nix;
|
nixosModules.default = ./contrib/nixos/modules/copyparty.nix;
|
||||||
overlays.default = final: prev: rec {
|
overlays.default = final: prev: {
|
||||||
copyparty = final.python3.pkgs.callPackage ./contrib/package/nix/copyparty {
|
copyparty = final.python3.pkgs.callPackage ./contrib/package/nix/copyparty {
|
||||||
ffmpeg = final.ffmpeg-full;
|
ffmpeg = final.ffmpeg-full;
|
||||||
};
|
};
|
||||||
|
|
||||||
partyfuse = prev.callPackage ./contrib/package/nix/partyfuse {
|
|
||||||
inherit copyparty;
|
|
||||||
};
|
|
||||||
|
|
||||||
u2c = prev.callPackage ./contrib/package/nix/u2c {
|
|
||||||
inherit copyparty;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
// flake-utils.lib.eachDefaultSystem (
|
// flake-utils.lib.eachDefaultSystem (
|
||||||
@ -54,8 +46,6 @@
|
|||||||
packages = {
|
packages = {
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
copyparty
|
copyparty
|
||||||
partyfuse
|
|
||||||
u2c
|
|
||||||
;
|
;
|
||||||
default = self.packages.${system}.copyparty;
|
default = self.packages.${system}.copyparty;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user