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: e3354dfc8c35
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: 2e08e8cb2602
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 17, 2020

  1. grocy: 2.7.0 -> 2.7.1 

    https://github.com/grocy/grocy/releases/tag/v2.7.1
(cherry picked from commit 135ae45)
    @Ma27
    Ma27 committed Apr 17, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    668d0de View commit details

  2. mitmproxy: fix build 

    ZHF: #80379
    @rnhmjoj
    rnhmjoj committed Apr 17, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rnhmjoj Michele Guerini Rocco
    GPG key ID: BFBAF4C975F76450
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2e08e8c View commit details
Showing with 12 additions and 5 deletions.
  1. +2 −2 pkgs/servers/grocy/default.nix
  2. +10 −3 pkgs/tools/networking/mitmproxy/default.nix
4 changes: 2 additions & 2 deletions pkgs/servers/grocy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "grocy";
version = "2.7.0";
version = "2.7.1";

src = fetchurl {
url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip";
sha256 = "10da7s8yc3adqzd8446ksgq61zyzxb4qbnwkzj11qh64y5hyj50q";
sha256 = "0ab1yxj499vadakq2c1lils3ir6fm02wrdgrirrlar4s4z6c4p7r";
};

nativeBuildInputs = [ unzip ];
13 changes: 10 additions & 3 deletions pkgs/tools/networking/mitmproxy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ buildPythonPackage rec {
# https://github.com/mitmproxy/mitmproxy/issues/3459
# TODO: remove on next update
name = "wsproto-0.13.patch";
url = https://github.com/mitmproxy/mitmproxy/commit/70777a1b6ed64af9cafcdef223a8a260ecc96864.patch;
url = "https://github.com/mitmproxy/mitmproxy/commit/70777a1b6ed64af9cafcdef223a8a260ecc96864.patch";
sha256 = "1ddxdr7js510kzyq3gyks4k5k1n8zb1i9amxw7wzmi1dcg8kqw9a";
# We strip these bounds anyway
excludes = [ "setup.py" ];
@@ -37,11 +37,19 @@ buildPythonPackage rec {
# https://github.com/mitmproxy/mitmproxy/issues/3403
# TODO: remove on next update
name = "dont-call-fixtures.patch";
url = https://github.com/mitmproxy/mitmproxy/commit/ce28721458c8cc71de86513a5110676e9763041b.patch;
url = "https://github.com/mitmproxy/mitmproxy/commit/ce28721458c8cc71de86513a5110676e9763041b.patch";
sha256 = "05pljr28lx7l1xgswqr9sz8dnhvc7npzh8xg2p9hignf159kd54d";
# Irrelevant in nixpkgs
excludes = [ "setup.py" "setup.cfg" "release/docker/*" ];
})
(fetchpatch {
# Fix for OpenSSL 1.1.1f
# https://github.com/mitmproxy/mitmproxy/pull/3692#issuecomment-608454530
# TODO: remove on next update
name = "temporarily-fix-key-logging.patch";
url = "https://github.com/mitmproxy/mitmproxy/commit/4bfb81c0089d0e0c1c24739f01fca41a3f055f3a.diff";
sha256 = "18yd6alalzq08biikc4aywhvfslz55fpxhixs9id1zzaf6c0vr45";
})
./pytest5.patch
];

@@ -79,6 +87,5 @@ buildPythonPackage rec {
homepage = https://mitmproxy.org/;
license = licenses.mit;
maintainers = with maintainers; [ fpletz kamilchm ];
broken = true;
};
}