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: 712026ead1fd
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: 697bff74fd9b
Choose a head ref
  • 9 commits
  • 8 files changed
  • 5 contributors

Commits on Apr 27, 2020

  1. nixpkgs-review: 2.3.0 -> 2.3.1

    Mic92 committed Apr 27, 2020
    Copy the full SHA
    2805d68 View commit details
  2. pulseeffects: fix build

    Meson 0.54 is no longer able to find Boost:
    
    See NixOS/nixpkgs#86131
    jtojnar committed Apr 27, 2020
    Copy the full SHA
    61a2045 View commit details
  3. PULL_REQUEST_TEMPLATE: try to simplify call-for-review

    The text is quite long and hard to read in hub (because it is one whole line
    with no line breaks). Also simplified the language/sentence structure a bit for
    non-native speakers.
    Mic92 committed Apr 27, 2020
    Copy the full SHA
    93862d0 View commit details
  4. Merge pull request #86110 from Mic92/pr-template

    PULL_REQUEST_TEMPLATE: try to simplify call-for-review
    Mic92 authored Apr 27, 2020
    Copy the full SHA
    974d11d View commit details
  5. Copy the full SHA
    12a614b View commit details
  6. Copy the full SHA
    1f20c08 View commit details
  7. Copy the full SHA
    1066f11 View commit details
  8. diffoscope: 142 -> 143

    Ma27 committed Apr 27, 2020
    Copy the full SHA
    caadc44 View commit details
  9. Merge pull request #86135 from Mic92/nixpkgs-review

    nixpkgs-review: 2.3.0 -> 2.3.1
    bhipple authored Apr 27, 2020
    Copy the full SHA
    697bff7 View commit details
11 changes: 10 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
<!-- Nixpkgs has a lot of new incoming Pull Requests, but not enough people to review this constant stream. Even if you aren't a committer, we would appreciate reviews of other PRs, especially simple ones like package updates. Just testing the relevant package/service and leaving a comment saying what you tested, how you tested it and whether it worked would be great. List of open PRs: <https://github.com/NixOS/nixpkgs/pulls>, for more about reviewing contributions: <https://hydra.nixos.org/job/nixpkgs/trunk/manual/latest/download/1/nixpkgs/manual.html#chap-reviewing-contributions>. Reviewing isn't mandatory, but it would help out a lot and reduce the average time-to-merge for all of us. Thanks a lot if you do! -->
<!--
To help with the large amounts of pull requests, we would appreciate your
reviews of other pull requests, especially simple package updates. Just leave a
comment describing what you have tested in the relevant package/service.
Reviewing helps to reduce the average time-to-merge for everyone.
Thanks a lot if you do!
List of open PRs: https://github.com/NixOS/nixpkgs/pulls
Reviewing guidelines: https://hydra.nixos.org/job/nixpkgs/trunk/manual/latest/download/1/nixpkgs/manual.html#chap-reviewing-contributions
-->

###### Motivation for this change


5 changes: 5 additions & 0 deletions pkgs/applications/audio/pulseeffects/default.nix
Original file line number Diff line number Diff line change
@@ -99,6 +99,11 @@ in stdenv.mkDerivation rec {
)
'';

# Meson is no longer able to pick up Boost automatically.
# https://github.com/NixOS/nixpkgs/issues/86131
BOOST_INCLUDEDIR = "${stdenv.lib.getDev boost}/include";
BOOST_LIBRARYDIR = "${stdenv.lib.getLib boost}/lib";

meta = with stdenv.lib; {
description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications";
homepage = "https://github.com/wwmm/pulseeffects";
8 changes: 4 additions & 4 deletions pkgs/servers/mautrix-whatsapp/default.nix
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

buildGoModule {
pname = "mautrix-whatsapp-unstable";
version = "2020-04-21";
version = "2020-04-21-1";

src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-whatsapp";
rev = "53fe1b18184fc0967658805abc8560641f8d2cb0";
sha256 = "0rahj9v7cgvk4w3m41jbs8vnya37dhq5wxyhyg74kwrv8a2nqxra";
rev = "e0aea74abf090bc9dc499332b28bf03640c162f8";
sha256 = "1gayjyh0x0axc1xak38zkdhvx6fy8pwlniqsirqy2mwcgkkll9i5";
};

modSha256 = "0jn88a4hagwfkw9bv8cg12ywsg35znmfkmhi1v7k2qpj5qzi81w6";
modSha256 = "1pddabyyz6q1snx9j7yv7dchasqa1y8nbpb5zrwmrpnwpns8kxl7";

meta = with stdenv.lib; {
homepage = "https://github.com/tulir/mautrix-whatsapp";
4 changes: 2 additions & 2 deletions pkgs/tools/misc/diffoscope/default.nix
Original file line number Diff line number Diff line change
@@ -9,11 +9,11 @@
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
version = "142";
version = "143";

src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "0c6lvppghw9ynjg2radr8z3fc6lpgmgwr6kxyih7q4rxqf4gfv6i";
sha256 = "09vvhzsxxgjvdnd48hdfz50i2svacdnwc2idirj4b27czi7c3czb";
};

outputs = [ "out" "man" ];
4 changes: 2 additions & 2 deletions pkgs/tools/package-management/nixpkgs-review/default.nix
Original file line number Diff line number Diff line change
@@ -8,13 +8,13 @@

python3.pkgs.buildPythonApplication rec {
pname = "nixpkgs-review";
version = "2.3.0";
version = "2.3.1";

src = fetchFromGitHub {
owner = "Mic92";
repo = "nixpkgs-review";
rev = version;
sha256 = "0qkvjl4f8a1905yj3ml32rfdr5q76igz21gn3dcya0pfqhrnb28i";
sha256 = "1v988jsxx2r82q6mf3503130cny088hin2as00yi26jzxjkrjcli";
};

makeWrapperArgs = [
4 changes: 2 additions & 2 deletions pkgs/tools/security/brutespray/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "brutespray";
version = "1.6.6";
version = "1.6.8";

src = fetchFromGitHub {
owner = "x90skysn3k";
repo = pname;
rev = "brutespray-${version}";
sha256 = "1rj8fkq1xz4ph1pmldphlsa25mg6xl7i7dranb0qjx00jhfxjxjh";
sha256 = "1pi4d5vcvvjsby39dq995dlhpxdicmfhqsiw23hr25m38ccfm3rh";
};

postPatch = ''

This file was deleted.

9 changes: 5 additions & 4 deletions pkgs/tools/security/pass/extensions/audit/default.nix
Original file line number Diff line number Diff line change
@@ -5,23 +5,24 @@ let

in stdenv.mkDerivation rec {
pname = "pass-audit";
version = "1.0.1";
version = "1.1";

src = fetchFromGitHub {
owner = "roddhjav";
repo = "pass-audit";
rev = "v${version}";
sha256 = "1mdckw0dwcnv8smp1za96y0zmdnykbkw2606v7mzfnzbz4zjdlwl";
sha256 = "1vapymgpab91kh798mirgs1nb7j9qln0gm2d3321cmsghhb7xs45";
};

patches = [
./0001-Make-it-possible-to-run-the-tests-offline.patch
./0002-Fix-audit.bash-setup.patch
];

postPatch = ''
substituteInPlace audit.bash \
--replace '/usr/bin/env python3' "${pythonEnv}/bin/python3"
--replace 'python3' "${pythonEnv}/bin/python3"
substituteInPlace Makefile \
--replace "install --root" "install --prefix ''' --root"
'';

outputs = [ "out" "man" ];