Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update-systemd-resolved: init at 1.3.0 #70172

Merged
merged 1 commit into from Nov 7, 2019
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

update-systemd-resolved: init at 1.3.0

  • Loading branch information
eadwu committed Oct 1, 2019
commit 5766bd451a63eae11ba19d9eaaa55968129aa056
@@ -0,0 +1,34 @@
{ lib, stdenv, fetchFromGitHub
, makeWrapper
, iproute, systemd, coreutils, utillinux }:

stdenv.mkDerivation rec {
pname = "update-systemd-resolved";
version = "1.3.0";

src = fetchFromGitHub {
owner = "jonathanio";
repo = "update-systemd-resolved";
rev = "v${version}";
sha256 = "19zhbpyms57yb70hi0ws5sbkpk2yqp9nnix3f86r36h1g93m70lm";
};

nativeBuildInputs = [ makeWrapper ];

buildFlags = [
"PREFIX=${placeholder "out"}/libexec/openvpn"
];

installPhase = ''
wrapProgram $out/libexec/openvpn/update-systemd-resolved \
--prefix PATH : ${lib.makeBinPath [ iproute systemd coreutils utillinux ]}
'';

meta = with stdenv.lib; {
description = "Helper script for OpenVPN to directly update the DNS settings of a link through systemd-resolved via DBus";
homepage = https://github.com/jonathanio/update-systemd-resolved;
maintainers = with maintainers; [ eadwu ];
license = licenses.gpl3;
platforms = platforms.unix;
};
}
@@ -5272,6 +5272,8 @@ in

update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { };

update-systemd-resolved = callPackage ../tools/networking/openvpn/update-systemd-resolved.nix { };

opae = callPackage ../development/libraries/opae { };

opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { };
@@ -15477,11 +15479,11 @@ in
bridge-utils = callPackage ../os-specific/linux/bridge-utils { };

busybox = callPackage ../os-specific/linux/busybox { };
busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix {
busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix {
# musl roadmap has RISC-V support projected for 1.1.20
busybox = if !stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.libc != "bionic"
then pkgsStatic.busybox
else busybox;
else busybox;
};

cachefilesd = callPackage ../os-specific/linux/cachefilesd { };
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.