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: 37a8a3277794
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 92ec5c8583f7
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Apr 14, 2021

  1. super-productivity: 1.10.45 -> 6.5.2

    Version 1.10.45 segfaults, this commit fixes the package
    cheriimoya authored and Mic92 committed Apr 14, 2021
    Copy the full SHA
    92ec5c8 View commit details
Showing with 56 additions and 107 deletions.
  1. +0 −106 pkgs/applications/networking/super-productivity/default.nix
  2. +55 −0 pkgs/applications/office/super-productivity/default.nix
  3. +1 −1 pkgs/top-level/all-packages.nix
106 changes: 0 additions & 106 deletions pkgs/applications/networking/super-productivity/default.nix

This file was deleted.

55 changes: 55 additions & 0 deletions pkgs/applications/office/super-productivity/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{ stdenv , lib , fetchurl , appimageTools , makeWrapper , electron_11 }:

let
electron = electron_11;
in
stdenv.mkDerivation rec {
pname = "super-productivity";
version = "6.5.2";

src = fetchurl {
url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage";
sha256 = "1ivl7chsv9axgk6nqkf580pav651hchi3di0mrp0pylpsqgk6f1f";
name = "${pname}-${version}.AppImage";
};

appimageContents = appimageTools.extractType2 {
name = "${pname}-${version}";
inherit src;
};

dontUnpack = true;
dontConfigure = true;
dontBuild = true;

nativeBuildInputs = [ makeWrapper ];

installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/share/${pname} $out/share/applications
cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
cp -a ${appimageContents}/superproductivity.desktop $out/share/applications/${pname}.desktop
cp -a ${appimageContents}/usr/share/icons $out/share
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
runHook postInstall
'';

postFixup = ''
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
--add-flags $out/share/${pname}/resources/app.asar \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"
'';

meta = with lib; {
description = "To Do List / Time Tracker with Jira Integration";
homepage = "https://super-productivity.com";
license = licenses.mit;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ offline ];
};
}
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -23555,7 +23555,7 @@ in
withPortAudio = stdenv.isDarwin;
};

super-productivity = callPackage ../applications/networking/super-productivity { };
super-productivity = callPackage ../applications/office/super-productivity { };

wlroots = callPackage ../development/libraries/wlroots {
inherit (xorg) xcbutilrenderutil;