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: 73fb59dbb89e
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: 7ee5dc023211
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Nov 28, 2019

  1. Add iptables to wireguard-tools 

    (cherry picked from commit f555515)
    @iclanzan @Mic92
    iclanzan authored and Mic92 committed Nov 28, 2019
    Copy the full SHA
    9d21383 View commit details

  2. pythonPackages.pipBuildHook: Add wheel dependency 

    And remove missing "options"

(cherry picked from commit 2b2c6e0)
    @adisbladis
    adisbladis committed Nov 28, 2019
    Copy the full SHA
    7ee5dc0 View commit details
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/python/hooks/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,10 +20,10 @@ in rec {
};
} ./flit-build-hook.sh) {};

pipBuildHook = callPackage ({ pip }:
pipBuildHook = callPackage ({ pip, wheel }:
makeSetupHook {
name = "pip-build-hook.sh";
deps = [ pip ];
deps = [ pip wheel ];
substitutions = {
inherit pythonInterpreter pythonSitePackages;
};
2 changes: 1 addition & 1 deletion pkgs/development/interpreters/python/hooks/pip-build-hook.sh
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ pipBuildPhase() {

mkdir -p dist
echo "Creating a wheel..."
@pythonInterpreter@ -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist "$options" .
@pythonInterpreter@ -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .
echo "Finished creating a wheel..."

runHook postBuild
3 changes: 2 additions & 1 deletion pkgs/tools/networking/wireguard-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
stdenv, fetchzip,

iptables ? null,
iproute ? null,
libmnl ? null,
makeWrapper ? null,
@@ -38,7 +39,7 @@ stdenv.mkDerivation rec {
--replace /usr/bin $out/bin
'' + optionalString stdenv.isLinux ''
for f in $out/bin/*; do
wrapProgram $f --prefix PATH : ${makeBinPath [procps iproute openresolv]}
wrapProgram $f --prefix PATH : ${makeBinPath [procps iproute iptables openresolv]}
done
'' + optionalString stdenv.isDarwin ''
for f in $out/bin/*; do