Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fb7193221ec3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 48b6f0eabb54
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 7, 2020

  1. bleachbit: 3.2.0 -> 4.0.0

    Jonathan Ringer committed Jul 7, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    856c42b View commit details

  2. Merge pull request #92644 from jonringer/bump-bleachbit 

    bleachbit: 3.2.0 -> 4.0.0
    @worldofpeace
    worldofpeace authored Jul 7, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    48b6f0e View commit details
Showing with 11 additions and 5 deletions.
  1. +11 −5 pkgs/applications/misc/bleachbit/default.nix
16 changes: 11 additions & 5 deletions pkgs/applications/misc/bleachbit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv
, pythonPackages
, python3Packages
, fetchurl
, gettext
, gobject-introspection
@@ -9,15 +9,15 @@
, libnotify
}:

pythonPackages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "bleachbit";
version = "3.2.0";
version = "4.0.0";

format = "other";

src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
sha256 = "1sszpn7ifiry0wwmkzdppzh61zvgrfypm9g7wk6q1ya20qhb5b51";
sha256 = "1dn3h6lr9ldbfpvgq9sdlk972sxhwalgj2f377qbqibm3yfxzpil";
};

nativeBuildInputs = [
@@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication rec {
libnotify
];

propagatedBuildInputs = with pythonPackages; [
propagatedBuildInputs = with python3Packages; [
chardet
pygobject3
requests
@@ -51,6 +51,12 @@ pythonPackages.buildPythonApplication rec {
"prefix=${placeholder "out"}"
];

# prevent double wrapping from wrapGApps and wrapPythonProgram
dontWrapGApps = true;
makeWrapperArgs = [
''''${gappsWrapperArgs[@]}''
];

strictDeps = false;

meta = with stdenv.lib; {