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: 5b7c90019251
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 83f231a0f2b4
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 10, 2019

  1. mullvad: remove unnecessary systemd service copying in installation

    @KamilaBorowska
    KamilaBorowska committed Oct 10, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    dimkl Dimitris Klouvas
    GPG key ID: 0931F5B7A6BC310B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0947bbc View commit details

Commits on Oct 11, 2019

  1. Merge pull request #70764 from xfix/nixpkg-mullvad-remove-systemd-ser… 

    …vice-copying

mullvad: remove unnecessary systemd service copying in installation
    @flokli
    flokli authored Oct 11, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    83f231a View commit details
Showing with 1 addition and 4 deletions.
  1. +1 −4 pkgs/applications/networking/mullvad-vpn/default.nix
5 changes: 1 addition & 4 deletions pkgs/applications/networking/mullvad-vpn/default.nix
View file
Original file line number Diff line number Diff line change
@@ -71,14 +71,10 @@ stdenv.mkDerivation rec {
mv opt/Mullvad\ VPN/* $out/share/mullvad
sed -i 's|\/opt\/Mullvad.*VPN|'$out'/bin|g' $out/share/applications/mullvad-vpn.desktop
sed -i 's|\/opt\/Mullvad.*VPN/resources|'$out'/bin|g' $out/share/mullvad/resources/mullvad-daemon.service
ln -s $out/share/mullvad/mullvad-vpn $out/bin/mullvad-vpn
ln -s $out/share/mullvad/resources/mullvad-daemon $out/bin/mullvad-daemon
mkdir -p $out/etc/systemd/system
ln -s $out/share/mullvad/resources/mullvad-daemon.service $out/etc/systemd/system/mullvad-daemon.service
runHook postInstall
'';

@@ -88,6 +84,7 @@ stdenv.mkDerivation rec {
changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md";
license = licenses.gpl3;
platforms = [ "x86_64-linux" ];
maintainers = [ maintainers.xfix ];
};

}