From 824f849fbab9541c8da7e86be9f1f2673757aaef Mon Sep 17 00:00:00 2001 From: Gabe Venberg Date: Fri, 4 Jul 2025 23:24:12 +0200 Subject: [PATCH] flake.lock update. --- flake.lock | 36 ++++++++++++++++---------------- hosts/cirrostratus/copyparty.nix | 31 --------------------------- 2 files changed, 18 insertions(+), 49 deletions(-) diff --git a/flake.lock b/flake.lock index f8a40f3..25f9fa8 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1750595231, - "narHash": "sha256-KcknL/i6UJtD4k3GmOqA/tXp+9DkgWE5GHvQGzSxpLk=", + "lastModified": 1751394747, + "narHash": "sha256-dhoKO2hYc+EnbM35YPKDkZ2tA0pia85qrOBMJVR1TzQ=", "owner": "9001", "repo": "copyparty", - "rev": "65c4e03574795f77afbe5378d4041a0f6497b5e0", + "rev": "bf11b2a4211510d833139a7b0ebf6e0b18ee1573", "type": "github" }, "original": { @@ -56,11 +56,11 @@ ] }, "locked": { - "lastModified": 1750680230, - "narHash": "sha256-kD88T/NqmcgfOBFAwphN30ccaUdj6K6+LG0XdM2w2LA=", + "lastModified": 1751607816, + "narHash": "sha256-5PtrwjqCIJ4DKQhzYdm8RFePBuwb+yTzjV52wWoGSt4=", "owner": "nix-community", "repo": "disko", - "rev": "8fd2d6c75009ac75f9a6fb18c33a239806778d01", + "rev": "da6109c917b48abc1f76dd5c9bf3901c8c80f662", "type": "github" }, "original": { @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1750792199, - "narHash": "sha256-AztT8H1V3cIgV3USZXnGWzKAQv6Hle3YhuaOFAV83mo=", + "lastModified": 1751638848, + "narHash": "sha256-7HiC6w4ROEbMmKtj5pilnLOJej9HkkfU9wEd5QSTyNo=", "owner": "nix-community", "repo": "home-manager", - "rev": "d400c361660526a199e1e56cc22f073c09c71d35", + "rev": "7d9e3c35f0d46f82bac791d76260f15f53d83529", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750431636, - "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", + "lastModified": 1751432711, + "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", + "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", "type": "github" }, "original": { @@ -196,11 +196,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750506804, - "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4206c4cb56751df534751b058295ea61357bbbaa", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -255,11 +255,11 @@ ] }, "locked": { - "lastModified": 1750119275, - "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=", + "lastModified": 1751606940, + "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=", "owner": "mic92", "repo": "sops-nix", - "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2", + "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d", "type": "github" }, "original": { diff --git a/hosts/cirrostratus/copyparty.nix b/hosts/cirrostratus/copyparty.nix index 6a8be13..66846ef 100644 --- a/hosts/cirrostratus/copyparty.nix +++ b/hosts/cirrostratus/copyparty.nix @@ -12,42 +12,11 @@ nsort = true; fk = 8; }; - betapackage = let - pyEnv = pkgs.python3.withPackages ( - python-pkgs: - with python-pkgs; [ - jinja2 - pillow - pkgs.ffmpeg - mutagen - argon2-cffi - ] - ); - in - pkgs.stdenv.mkDerivation { - pname = "copyparty"; - version = "1.17.0"; - src = pkgs.fetchurl { - url = "https://ocv.me/copyparty/beta/copyparty-sfx.py"; - hash = "sha256-vXx+4Stax/HH+eIc1ktYM+zuoRxEB2mxfoY7haPAID4="; - }; - buildInputs = [pkgs.makeWrapper]; - dontUnpack = true; - dontBuild = true; - installPhase = '' - install -Dm755 $src $out/share/copyparty-sfx.py - makeWrapper ${pyEnv.interpreter} $out/bin/copyparty \ - --set PATH '${lib.makeBinPath [pkgs.util-linux pkgs.ffmpeg]}:$PATH' \ - --add-flags "$out/share/copyparty-sfx.py" - ''; - meta.mainProgram = "copyparty"; - }; in { nixpkgs.overlays = [inputs.copyparty.overlays.default]; environment.systemPackages = with pkgs; [copyparty]; services.copyparty = { enable = true; - package = betapackage; user = config.host.details.user; group = "users"; # directly maps to values in the [global] section of the copyparty config.