Update dependencies

This commit is contained in:
Charlotte Van Petegem 2023-01-24 09:18:55 +01:00
parent 1644d31e14
commit 702a58e8f9
No known key found for this signature in database
GPG key ID: 019E764B7184435A
3 changed files with 0 additions and 65 deletions

View file

@ -101,7 +101,6 @@
emacs-overlay.overlay
(self: super: {
tetris = tetris.packages.${self.system}.default;
udp2raw = self.callPackage ./packages/udp2raw { };
mastodon = nixpkgs-22_11.legacyPackages.${self.system}.mastodon;
gitlab-pages = nixpkgs-22_11.legacyPackages.${self.system}.gitlab-pages;
gitlab = nixpkgs-22_11.legacyPackages.${self.system}.gitlab;

View file

@ -1,41 +0,0 @@
{ lib
, stdenv
, fetchFromGitHub
, makeWrapper
, iptables
}:
stdenv.mkDerivation rec {
pname = "udp2raw";
version = "20200818.0";
src = fetchFromGitHub {
owner = "wangyu-";
repo = "udp2raw";
rev = version;
hash = "sha256-TkTOfF1RfHJzt80q0mN4Fek3XSFY/8jdeAVtyluZBt8=";
};
nativeBuildInputs = [ makeWrapper ];
makeFlags = [ "dynamic" ];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp udp2raw_dynamic $out/bin/udp2raw
wrapProgram $out/bin/udp2raw --prefix PATH : "${lib.makeBinPath [ iptables ]}"
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/wangyu-/udp2raw";
description = "A tunnel which turns UDP traffic into encrypted UDP/FakeTCP/ICMP traffic by using a raw socket";
license = licenses.mit;
changelog = "https://github.com/wangyu-/udp2raw/releases/tag/${version}";
maintainers = with maintainers; [ chvp ];
platforms = platforms.linux;
};
}

View file

@ -1,23 +0,0 @@
From f8a3c4e94fb526d108fa8564fbe1fc1b416eea5e Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sat, 21 Jan 2023 10:16:41 +0100
Subject: [PATCH] nixos/grafana-image-renderer: use grafana freeform settings
in provisioning
---
nixos/modules/services/monitoring/grafana-image-renderer.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/modules/services/monitoring/grafana-image-renderer.nix b/nixos/modules/services/monitoring/grafana-image-renderer.nix
index 60f6e84c63c7d..7ea17b07567cd 100644
--- a/nixos/modules/services/monitoring/grafana-image-renderer.nix
+++ b/nixos/modules/services/monitoring/grafana-image-renderer.nix
@@ -108,7 +108,7 @@ in {
services.grafana.settings.rendering = mkIf cfg.provisionGrafana {
url = "http://localhost:${toString cfg.settings.service.port}/render";
- callback_url = "http://localhost:${toString config.services.grafana.port}";
+ callback_url = "http://localhost:${toString config.services.grafana.settings.server.http_port}";
};
services.grafana-image-renderer.chromium = mkDefault pkgs.chromium;