summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2021-09-12 12:12:45 +0200
committerlassulus <lassulus@lassul.us>2021-09-12 12:12:45 +0200
commit7ada89628977334d59b9d9136947df140098ff9f (patch)
tree33087025fc167b14fd59cf2ef4d3b782c4404b07
parent85aa4aa5b39016fcf603881c416c21a0c8d062af (diff)
parentd81a4fcfdfed37f5b6db61c50fae090aa84a2da5 (diff)
Merge remote-tracking branch 'gum/master'
-rw-r--r--krebs/2configs/shack/powerraw.nix1
-rw-r--r--makefu/5pkgs/chitubox/default.nix10
2 files changed, 6 insertions, 5 deletions
diff --git a/krebs/2configs/shack/powerraw.nix b/krebs/2configs/shack/powerraw.nix
index ace74cbc3..64e1911cf 100644
--- a/krebs/2configs/shack/powerraw.nix
+++ b/krebs/2configs/shack/powerraw.nix
@@ -15,6 +15,7 @@ let
in {
# receive response from light.shack / standby.shack
networking.firewall.allowedUDPPorts = [ 11111 ];
+ networking.firewall.allowedTCPPorts = [ 11111 ];
users.users.powermeter = {
extraGroups = [ "dialout" ];
isSystemUser = true;
diff --git a/makefu/5pkgs/chitubox/default.nix b/makefu/5pkgs/chitubox/default.nix
index bea33e64f..d0596e700 100644
--- a/makefu/5pkgs/chitubox/default.nix
+++ b/makefu/5pkgs/chitubox/default.nix
@@ -4,26 +4,26 @@
, libpulseaudio
, xlibs
, gst_all_1
-, kerberos
+, krb5
, alsaLib
}:
# via https://raw.githubusercontent.com/simon-the-sourcerer-ab/chitubox/main/default.nix
stdenv.mkDerivation rec {
pname = "chitubox";
- version = "1.8.1";
+ version = "1.9.0";
src = builtins.fetchTarball {
#url = "https://sac.chitubox.com/software/download.do?softwareId=17839&softwareVersionId=v${version}&fileName=CHITUBOX_V${version}.tar.gz";
url = "https://archive.org/download/chitubox-v-1.8.1.tar/CHITUBOX_V${version}.tar.gz";
- sha256 = "08fh8w7s5qvlx6bhdg24g81a7zprq7n8m27w2vdv0cd8j0wixbsx";
+ sha256 = "1ywcizxdkwlhi8z3jshl3b6ha8iwibssxh8fk7s32h3z8vl8zcl7";
};
nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = with xlibs; [ stdenv.cc.cc.lib libglvnd libgcrypt zlib glib fontconfig freetype libdrm
- libxkbcommon libpulseaudio kerberos alsaLib
+ libxkbcommon libpulseaudio alsaLib
xcbutilwm xcbutilimage xcbutilrenderutil xcbutilkeysyms
- gst_all_1.gst-plugins-base gst_all_1.gstreamer
+ gst_all_1.gst-plugins-base gst_all_1.gstreamer krb5
];
buildPhase = ''