Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 85142b9ad27b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5e955e3ec409
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 1, 2019

  1. update-systemd-resolved: init at 1.3.0

    @eadwu
    eadwu committed Oct 1, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5766bd4 View commit details

Commits on Nov 7, 2019

  1. Merge pull request #70172 from eadwu/init/update-systemd-resolved 

    update-systemd-resolved: init at 1.3.0
    @matthewbauer
    matthewbauer authored Nov 7, 2019
    Copy the full SHA
    5e955e3 View commit details
Showing with 36 additions and 0 deletions.
  1. +34 −0 pkgs/tools/networking/openvpn/update-systemd-resolved.nix
  2. +2 −0 pkgs/top-level/all-packages.nix
34 changes: 34 additions & 0 deletions pkgs/tools/networking/openvpn/update-systemd-resolved.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -5400,6 +5400,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 { };