From 2e099ba6a93a3b46686f64843af4a328f25b8ac0 Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Fri, 9 Apr 2021 14:08:34 +0300 Subject: [PATCH] chore(deps): update flake deps --- flake.lock | 24 ++++++++++++------------ overlays/hydrus.nix | 16 ++++++++++------ 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index cd1bb53..8e99b48 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "cachix": { "locked": { - "lastModified": 1617042094, - "narHash": "sha256-c8w5/Dz+r8gHIGZs1BHJPSzpP3Sga/BYebRkqBoDANY=", + "lastModified": 1617786842, + "narHash": "sha256-nuhewc9ANLkY2dBc9ikBQmy5EdCPElHbxd/pU96HdG0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "310885ec804f9fa0db5c705c7f5d35d415f50564", + "rev": "d6f63659a7021051a46035373ed50fbea7e4e924", "type": "github" }, "original": { @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1617493660, - "narHash": "sha256-PnPSs6RkkI2M6GyB2iGsL6hgDTe01yk5ZGP9q/Q14M8=", + "lastModified": 1617894699, + "narHash": "sha256-zlG3xNXgqo5pbMmfq8YaqGoVjElHnTDnEz13A+pUbZY=", "owner": "nix-community", "repo": "home-manager", - "rev": "25a6a6d2984e70c9a07c8f8a69ebe24e6c700abf", + "rev": "56f5f41ed42f7d476a7c79fa8ec71f5605487abf", "type": "github" }, "original": { @@ -74,11 +74,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1617082367, - "narHash": "sha256-W0cQPGjc4IVzryaGycuoS8KZkXafS1P23w/fcKLoD5Y=", + "lastModified": 1617899217, + "narHash": "sha256-gd5JHH7IkeoIQ/oiGZSqDpGdGt7DMRJTQ8JiD8+hdOQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "04a2b269d8921505a2969fc9ec25c1f517f2b307", + "rev": "9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2", "type": "github" }, "original": { @@ -99,11 +99,11 @@ ] }, "locked": { - "lastModified": 1617091432, - "narHash": "sha256-L501OfMSE3OadQaEAPTPPJCWdgn3R5hXWzP6EBTGAos=", + "lastModified": 1617904961, + "narHash": "sha256-M45PTFsPZ6mWQ3UxrTUxlO4D+bXaKQuAsjfcpKBcAa4=", "owner": "colemickens", "repo": "nixpkgs-wayland", - "rev": "c56fca9357685dea173d81a9be67f7e1375758e3", + "rev": "fadd4b3505bca3175f2a00c3e5810ed074b55bb8", "type": "github" }, "original": { diff --git a/overlays/hydrus.nix b/overlays/hydrus.nix index 816fc8c..f2eccda 100644 --- a/overlays/hydrus.nix +++ b/overlays/hydrus.nix @@ -1,12 +1,16 @@ final: prev: { hydrus = prev.hydrus.overrideAttrs (old: rec { pname = "hydrus"; - version = "433"; - src = prev.fetchFromGitHub { - owner = "hydrusnetwork"; - repo = "hydrus"; - rev = "v433"; - sha256 = "sha256-RZKmtVSCkMuJxuGGgk92J0Y71aHRZYsaBmUZy/gC9Ms="; + version = "434"; + src = builtins.fetchGit { + url = "https://github.com/hydrusnetwork/hydrus.git"; + rev = "71bedccaeabf411307edeac3b03a0903d2c23ec8"; }; + postPatch = '' + sed 's;os\.path\.join(\sHC\.BIN_DIR,.*;"${prev.miniupnpc_2}/bin/upnpc";' \ + -i ./hydrus/core/networking/HydrusNATPunch.py + sed 's;os\.path\.join(\sHC\.BIN_DIR,.*;"${prev.swftools}/bin/swfrender";' \ + -i ./hydrus/core/HydrusFlashHandling.py + ''; }); }