diff options
| author | Michele Guerini Rocco <rnhmjoj@users.noreply.github.com> | 2021-06-02 14:54:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-02 14:54:51 +0200 |
| commit | 5285a51c2e0b62c11211ee07692c3a2226f1a4b1 (patch) | |
| tree | ad624a847d2ec9fb9b0038c9d1078a2bec881954 | |
| parent | Merge branch 'staging-21.05' into release-21.05 (diff) | |
| parent | python3Packages.adblock: fix build on Darwin (diff) | |
| download | nixpkgs-5285a51c2e0b62c11211ee07692c3a2226f1a4b1.tar.gz | |
Merge pull request #125368 from NixOS/backport-125289-to-release-21.05
[Backport release-21.05] qutebrowser: 2.2.2 -> 2.2.3
| -rw-r--r-- | pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/adblock/default.nix | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 15e759c8b625..1f03184eeed4 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -31,12 +31,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "2.2.2"; + version = "2.2.3"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "11vjp20gzmdjj09b7wxzn7ar6viih0bk76y618yqsyqqkffylmbq"; + sha256 = "sha256-BoP168jxj94nvkrcgC83fPw/TPRsI2PbCooqzWNF62I="; }; # Needs tox diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index 8fc697828f0a..59d1f2e4e7a8 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -8,6 +8,7 @@ , openssl , publicsuffix-list , isPy27 +, libiconv , CoreFoundation , Security }: @@ -37,7 +38,7 @@ buildPythonPackage rec { ++ (with rustPlatform; [ cargoSetupHook maturinBuildHook ]); buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; + ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ]; PSL_PATH = "${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"; @@ -49,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for Brave's adblocking library, which is written in Rust"; homepage = "https://github.com/ArniDagur/python-adblock/"; - maintainers = with maintainers; [ petabyteboy ]; + maintainers = with maintainers; [ petabyteboy dotlambda ]; license = with licenses; [ asl20 mit ]; }; } |