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: 0feb4e8729e2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 983df8cd7952
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 15, 2019

  1. rescuetime: 2.14.3.1 -> 2.14.5.2 

    - Fix for Qt plugin not found
    @iAmMrinal0
    iAmMrinal0 committed Oct 15, 2019
    Copy the full SHA
    b3f415d View commit details

  2. Merge pull request #70953 from iAmMrinal0/fix/rescuetime 

    rescuetime: 2.14.3.1 -> 2.14.5.2
    @worldofpeace
    worldofpeace authored Oct 15, 2019
    Copy the full SHA
    983df8c View commit details
Showing with 7 additions and 7 deletions.
  1. +6 −6 pkgs/applications/misc/rescuetime/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
12 changes: 6 additions & 6 deletions pkgs/applications/misc/rescuetime/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, makeWrapper, libXScrnSaver }:
{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver }:

let
src =
if stdenv.hostPlatform.system == "i686-linux" then fetchurl {
name = "rescuetime-installer.deb";
url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb";
sha256 = "03bky9vja7fijz45n44b6gawd6q8yd30nx6nya9lqdlxd1bkqmji";
sha256 = "0mw8dh9z7pqan0yrhycmv39h5c1sc4mbw5l02cfnn17cy75xdiay";
} else fetchurl {
name = "rescuetime-installer.deb";
url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb";
sha256 = "03bky9vja7fijz45n44b6gawd6q8yd30nx6nya9lqdlxd1bkqmji";
sha256 = "1a6pc8vi2ab721kzyhvg6bmw24dr85dgmx2m9j9vbf3jyr85fv10";
};
in stdenv.mkDerivation {
in mkDerivation {
# https://www.rescuetime.com/updates/linux_release_notes.html
name = "rescuetime-2.14.3.1";
name = "rescuetime-2.14.5.2";
inherit src;
buildInputs = [ dpkg makeWrapper ];
nativeBuildInputs = [ dpkg ];
# avoid https://github.com/NixOS/patchelf/issues/99
dontStrip = true;
unpackPhase = ''
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -5909,7 +5909,7 @@ in

reptyr = callPackage ../os-specific/linux/reptyr {};

rescuetime = callPackage ../applications/misc/rescuetime { };
rescuetime = libsForQt5.callPackage ../applications/misc/rescuetime { };

reuse = callPackage ../tools/package-management/reuse { };