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

Commits on Nov 8, 2020

  1. dogdns: fix build on darwin

    @marsam
    marsam committed Nov 8, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ae17a85 View commit details

  2. dogdns: install completions

    @marsam
    marsam committed Nov 8, 2020
    Copy the full SHA
    f4e1112 View commit details

Commits on Nov 9, 2020

  1. Merge pull request #103131 from marsam/fix-dogdns-darwin 

    dogdns: fix build on darwin
    @marsam
    marsam authored Nov 9, 2020

    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
    5fff64b View commit details
Showing with 13 additions and 3 deletions.
  1. +10 −2 pkgs/tools/networking/dogdns/default.nix
  2. +3 −1 pkgs/top-level/all-packages.nix
12 changes: 10 additions & 2 deletions pkgs/tools/networking/dogdns/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,8 @@
, rustPlatform
, pkg-config
, openssl
, Security
, installShellFiles
}:

rustPlatform.buildRustPackage rec {
@@ -16,11 +18,17 @@ rustPlatform.buildRustPackage rec {
sha256 = "088ib0sncv0vrvnqfvxf5zc79v7pnxd2cmgp4378r6pmgax9z9zy";
};

nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
nativeBuildInputs = [ installShellFiles ]
++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security ];

cargoSha256 = "08scc6vh703245rg3xkffhalrk5pisd0wg54fd49d7gdbyjivgi6";

postInstall = ''
installShellCompletion completions/dog.{bash,fish,zsh}
'';

meta = with stdenv.lib; {
description = "Command-line DNS client";
homepage = "https://dns.lookup.dog";
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -3355,7 +3355,9 @@ in

dog = callPackage ../tools/system/dog { };

dogdns = callPackage ../tools/networking/dogdns { };
dogdns = callPackage ../tools/networking/dogdns {
inherit (darwin.apple_sdk.frameworks) Security;
};

dosfstools = callPackage ../tools/filesystems/dosfstools { };