Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 61b2e0cba8d1
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 541b2413b48d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 14, 2018

  1. nbd: add which to buildInputs (#46635) 

    * NBD: add which to buildInputs.
* NBD: move pkgconfig and which to nativeBuildInputs.
    @qolii @xeji
    qolii authored and xeji committed Sep 14, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    0x4A6F
    GPG key ID: 8DEDBA5BE07080E1
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3c57887 View commit details

  2. afew: add manpage 

    Generate the manpage which was previously missing.
    @xeji @garbas
    xeji authored and garbas committed Sep 14, 2018
    Copy the full SHA
    541b241 View commit details
Showing with 15 additions and 4 deletions.
  1. +11 −1 pkgs/applications/networking/mailreaders/afew/default.nix
  2. +4 −3 pkgs/tools/networking/nbd/default.nix
12 changes: 11 additions & 1 deletion pkgs/applications/networking/mailreaders/afew/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,12 +9,22 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0105glmlkpkjqbz350dxxasvlfx9dk0him9vwbl86andzi106ygz";
};

buildInputs = with pythonPackages; [ setuptools_scm ];
nativeBuildInputs = with pythonPackages; [ sphinx setuptools_scm ];

propagatedBuildInputs = with pythonPackages; [
pythonPackages.notmuch chardet dkimpy
] ++ stdenv.lib.optional (!pythonPackages.isPy3k) subprocess32;

postBuild = ''
make -C docs man
'';

postInstall = ''
mandir="$out/share/man/man1"
mkdir -p "$mandir"
cp docs/build/man/* "$mandir"
'';

makeWrapperArgs = [
''--prefix PATH ':' "${notmuch}/bin"''
];
7 changes: 4 additions & 3 deletions pkgs/tools/networking/nbd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib }:
{ stdenv, fetchurl, pkgconfig, glib, which }:

stdenv.mkDerivation rec {
name = "nbd-3.18";
@@ -8,10 +8,11 @@ stdenv.mkDerivation rec {
sha256 = "0cb0sjiv0j9sh9dk24nrjm7sa0axbrcp2av5hc91g1ryzk764dyq";
};

buildInputs =
[ pkgconfig glib ]
buildInputs = [ glib ]
++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders;

nativeBuildInputs = [ pkgconfig which ];

postInstall = ''
mkdir -p "$out/share/doc/${name}"
cp README.md "$out/share/doc/${name}/"